diff --git a/.env.development b/.env.development
index 30e67c27b..0fde813fa 100644
--- a/.env.development
+++ b/.env.development
@@ -1,9 +1,9 @@
 NODE_ENV=development
 
 # VUE_APP_API_SERVER =  https://epmet-preview.elinkservice.cn/api
-# VUE_APP_API_SERVER =  http://localhost:8080/api
+# VUE_APP_API_SERVER =  http://192.168.1.60:8080/api
 VUE_APP_API_SERVER =  http://219.146.91.110:30801/api
-# VUE_APP_API_SERVER =  http://219.146.91.110:30801/api
+# VUE_APP_API_SERVER =  http://219.146.91.110:30801/api219.146.91.110:30801
 # VUE_APP_API_SERVER =  https://epmet-yantai.elinkservice.cn/api
 # VUE_APP_API_SERVER =  https://epmet-test.elinkservice.cn/api
 # VUE_APP_API_SERVER =   https://epmet-cloud.elinkservice.cn/api
diff --git a/.env.production.sit b/.env.production.sit
index 2191f2dde..93172b43e 100644
--- a/.env.production.sit
+++ b/.env.production.sit
@@ -1,7 +1,7 @@
 NODE_ENV=production
 # VUE_APP_API_SERVER =  https://epmet-test.elinkservice.cn/api
-# VUE_APP_API_SERVER =  http://192.168.1.140/api
 VUE_APP_API_SERVER =  http://219.146.91.110:30801/api
+# VUE_APP_API_SERVER =  http://192.168.1.60:8080/api
 VUE_APP_BIPASS_API_SERVER = http://dcommunity-dev.elinkservice.cn:30801/linkdata/linkdata-gateway/route
 VUE_APP_NODE_ENV=prod:sit
 VUE_APP_PUBLIC_PATH=epmet-oper
diff --git a/README.md b/README.md
index 9c118b8ac..cf2224fa6 100644
--- a/README.md
+++ b/README.md
@@ -19,3 +19,5 @@ npm run build
 ```
 npm run lint
 ```
+
+export NODE_OPTIONS=--max-old-space-size=4096
\ No newline at end of file
diff --git a/package.json b/package.json
index 03f705960..9ecdd713d 100644
--- a/package.json
+++ b/package.json
@@ -48,6 +48,7 @@
     "proj4": "^2.8.0",
     "qs": "^6.7.0",
     "quill": "^1.3.6",
+    "relation-graph": "^2.1.31",
     "screenfull": "^4.2.1",
     "sortablejs": "^1.12.0",
     "svg-sprite-loader": "^4.1.6",
diff --git a/src/assets/images/index/father.png b/src/assets/images/index/father.png
new file mode 100644
index 000000000..41192bd0b
Binary files /dev/null and b/src/assets/images/index/father.png differ
diff --git a/src/assets/images/index/girl.png b/src/assets/images/index/girl.png
new file mode 100644
index 000000000..77ed518a3
Binary files /dev/null and b/src/assets/images/index/girl.png differ
diff --git a/src/assets/images/index/grandma.png b/src/assets/images/index/grandma.png
new file mode 100644
index 000000000..5185c29a9
Binary files /dev/null and b/src/assets/images/index/grandma.png differ
diff --git a/src/assets/images/index/grandpa.png b/src/assets/images/index/grandpa.png
new file mode 100644
index 000000000..d65fc72a6
Binary files /dev/null and b/src/assets/images/index/grandpa.png differ
diff --git a/src/assets/images/index/home.png b/src/assets/images/index/home.png
new file mode 100644
index 000000000..89aff3f75
Binary files /dev/null and b/src/assets/images/index/home.png differ
diff --git a/src/assets/images/index/loading.png b/src/assets/images/index/loading.png
new file mode 100644
index 000000000..5c8e36ff2
Binary files /dev/null and b/src/assets/images/index/loading.png differ
diff --git a/src/assets/images/index/mother.png b/src/assets/images/index/mother.png
new file mode 100644
index 000000000..0d934878a
Binary files /dev/null and b/src/assets/images/index/mother.png differ
diff --git a/src/assets/images/index/son.png b/src/assets/images/index/son.png
new file mode 100644
index 000000000..e52abf76c
Binary files /dev/null and b/src/assets/images/index/son.png differ
diff --git a/src/assets/images/shuju/renfang/index/zhiding.png b/src/assets/images/shuju/renfang/index/zhiding.png
new file mode 100644
index 000000000..2c711da5a
Binary files /dev/null and b/src/assets/images/shuju/renfang/index/zhiding.png differ
diff --git a/src/assets/scss/modules/index.scss b/src/assets/scss/modules/index.scss
index a95a64baa..abf63be8b 100644
--- a/src/assets/scss/modules/index.scss
+++ b/src/assets/scss/modules/index.scss
@@ -1,39 +1,123 @@
 @import "../c/config";
 @import "../c/function";
 
+// .g-row {
+//     padding: 5px 6px;
+//     display: flex;
+//     height: 100%;
+//     .g-row-left {
+//         margin-right: auto;
+//         width: calc(66%);
+//         flex-direction: column;
+//         // justify-content: space-around;
+//     }
+//     .g-row-right {
+//         display: flex;
+//         margin-left: auto;
+//         width: calc(34% - 16px);
+//         flex-direction: column;
+//         justify-content: space-around;
+//     }
+// }
+.white-box {
+    background-color: white;
+    margin-top: 10px;
+    box-shadow: 0px 6px 16px 0px rgba(0, 0, 0, 0.08), 0px 3px 6px -4px rgba(0, 0, 0, 0.12);
+    flex-grow: 1;
+    max-height: calc(50% - 10px);
+    overflow: hidden scroll;
+    position: relative;
+
+}
+
+// .echart{
+//     position: absolute;
+//     // left: -20px;
+//     top: 10px;
+//     width: 1004px;
+//     user-select: none;
+//     -webkit-tap-highlight-color: rgba(0, 0, 0, 0);
+//     padding: 0px;
+//     margin: 0px;
+//     border-width: 0px;
+//     height: 260px;
+// }
+.noe-text {
+    position: relative;
+    // position: fixed; 
+    padding-left: 14px;
+    height: 16px;
+    margin-right: 10px;
+    font-size: 15px;
+    z-index: 1;
+    display: flex;
+    justify-content: space-between;
+    background: white;
+    // max-width: calc(100% - 20px);
+    width: 100%;
+    // overflow-x: auto;
+}
+
+.noe-text::before {
+    content: "";
+    position: absolute;
+    top: 5px;
+    left: 0;
+    height: 70%;
+    width: 4px;
+    background-color: #2683DB;
+}
+
 .g-row {
     padding: 5px 6px;
     display: flex;
     height: 100%;
+    align-items: stretch;
+
     .g-row-left {
-        margin-right: auto;
-        width: calc(66%);
-        display: flex;
+        // margin-right: auto;
+        margin-right: 10px;
+        width: calc(60% - 25px);
         flex-direction: column;
-        justify-content: space-around;
+        // justify-content: space-around;
     }
+
     .g-row-right {
+        display: flex;
         margin-left: auto;
-        width: calc(34% - 16px);
+        margin-right: 5px;
+        flex-grow: 0.5;
+        width: calc(40% - 25px);
+        flex-direction: column;
+        justify-content: space-around;
     }
 }
 
 .m-box {
+    flex-grow: 1;
     position: relative;
-    padding: 16px;
+    // padding: 16px;
+    margin-top: 10px;
+    margin-left: 10px;
     background: #ffffff;
     box-shadow: 0px 6px 16px 0px rgba(0, 0, 0, 0.08), 0px 3px 6px -4px rgba(0, 0, 0, 0.12);
     border-radius: 2px;
 
+    .merw {
+        background: #000;
+        margin-top: 10px;
+    }
+
     .header {
-        padding: 4px 0;
         font-size: 15px;
         font-family: PingFangSC-Medium, PingFang SC;
         font-weight: 500;
         color: rgba(0, 0, 0, 0.85);
         line-height: 17px;
+        margin-top: 16px;
+        margin-left: 10px;
 
-        > img {
+        >img {
             vertical-align: bottom;
             margin-right: 5px;
             width: 17px;
@@ -41,6 +125,14 @@
         }
     }
 
+    .newqsa {
+        border-left: 4px solid #2683DB;
+        height: 100%;
+        // width: 4px;
+        margin-left: -10px;
+        padding-left: 8px;
+    }
+
     .more {
         position: absolute;
         top: 14px;
@@ -62,11 +154,38 @@
 
 .m-search {
     box-sizing: border-box;
-    padding: 40px 80px;
-    margin-bottom: 16px;
-    height: 280px;
-    background-image: url("../../images/index/chaxun-bg.png");
+    padding: 0px 16px;
+    margin-bottom: 10px;
+    height: 220px;
+    display: flex;
+    flex-direction: column;
+    // background-image: url("../../images/index/chaxun-bg.png");
     background-size: cover;
+    position: relative;
+
+    .wrap {
+       
+        width: 100%;
+    }
+
+    .mewq {
+        // background-color: #333;
+        margin-top: 24px;
+        width: inherit;
+        height: 64px;
+        box-sizing: border-box;
+        display: grid;
+        grid-template-columns: repeat(7, 1fr);
+        gap: 5px;
+        text-align: center;
+    }
+
+    .boxss {
+        background-color: #F8F8F8;
+        border-radius: 10px;
+    }
+
+
 
     .title {
         height: 47px;
@@ -80,7 +199,8 @@
         margin-top: 24px;
         display: flex;
         align-items: center;
-        > div {
+
+        >div {
             position: relative;
             margin-right: 30px;
             width: 56px;
@@ -95,13 +215,16 @@
             &:hover {
                 color: $c1_on;
             }
+
             &.z-on {
                 color: #ffffff;
                 background: $c1;
+                margin-left: 10px;
 
                 &:hover {
                     color: #ffffff;
                 }
+
                 &::after {
                     content: "";
                     display: block;
@@ -126,7 +249,9 @@
 
         .search-input {
             position: relative;
-            width: 60%;
+            left: 0;
+            right: 0;
+            width: 100%;
             height: 48px;
             background: #ffffff;
             border-radius: 4px;
@@ -182,6 +307,7 @@
                 font-weight: 500;
                 color: #ffffff;
                 cursor: pointer;
+
                 &:hover {
                     background: $c1_on;
                 }
@@ -200,6 +326,7 @@
             font-weight: 500;
             color: $c1;
             cursor: pointer;
+
             img {
                 width: 20px;
                 height: 20px;
@@ -216,134 +343,148 @@
 .m-pan {
     position: relative;
     box-sizing: border-box;
-    width: 100%;
-    height:calc( 100vh - 420px);
+    // width: 100%;
+    // height:calc( 82vh - 420px);
+    height: calc(82vh - 460px);
     overflow: hidden;
-  .flex_box{
-     height:calc(100% - 30px);
-     width: 100%;
-     overflow: hidden;
-     .cnt {
-        margin-top: 20px;
-        display: flex;
-        overflow: hidden;
+
+    .flex_box {
         height: 100%;
-        .cnt-left {
-            box-sizing: border-box;
-            padding: 16px;
-            width: 240px;
-            height: 402px;
-            background: #f5f7fa;
-            border-radius: 2px;
-            font-size: 14px;
-            font-family: PingFangSC-Regular, PingFang SC;
-            font-weight: 400;
-            color: rgba(0, 0, 0, 0.85);
-            line-height: 24px;
+        width: 100%;
+        overflow: hidden;
+        display: flex;
+        flex-direction: column;
+        .cnt {
+            margin-top: 20px;
+            display: flex;
+            overflow: hidden;
             height: 100%;
-            .subtitle {
-                padding: 4px 0;
-                font-size: 15px;
-                font-family: PingFangSC-Medium, PingFang SC;
-                font-weight: 500;
+            flex: 1;
+            .cnt-left {
+                box-sizing: border-box;
+                padding: 16px;
+                width: 240px;
+                height: 402px;
+                background: #f5f7fa;
+                border-radius: 2px;
+                font-size: 14px;
+                font-family: PingFangSC-Regular, PingFang SC;
+                font-weight: 400;
                 color: rgba(0, 0, 0, 0.85);
-                line-height: 17px;
-
-                &:last-of-type {
-                    margin-top: 40px;
-                }
+                line-height: 24px;
+                height: 100%;
 
-                > img {
-                    vertical-align: bottom;
-                    margin-right: 5px;
-                    width: 17px;
-                    height: 17px;
-                }
-            }
-        }
-        .cnt-right {
-            .list {
-                margin-bottom: 71px;
-                .item {
-                    margin-bottom: 30px;
-                    display: flex;
-                    align-items: center;
-                    font-size: 14px;
+                .subtitle {
+                    padding: 4px 0;
+                    font-size: 15px;
                     font-family: PingFangSC-Medium, PingFang SC;
                     font-weight: 500;
-                    color: rgba(44, 53, 66, 0.85);
-                    line-height: 24px;
-                    cursor: pointer;
+                    color: rgba(0, 0, 0, 0.85);
+                    line-height: 17px;
 
-                    &:hover {
-                        color: $c1;
+                    &:last-of-type {
+                        margin-top: 40px;
                     }
 
-                    .item-name {
-                        margin-left: 5px;
-                        width: 80px;
-                        flex-shrink: 0;
+                    >img {
+                        vertical-align: bottom;
+                        margin-right: 5px;
+                        width: 17px;
+                        height: 17px;
                     }
+                }
+            }
 
-                    .item-div {
-                        width: 1px;
-                        height: 12px;
-                        background: #d8d8d8;
-                        border-radius: 1px;
-                    }
+            .cnt-right {
+                .list {
+                    margin-bottom: 71px;
+                    margin-left: 10px;
+
+                    .item {
+                        margin-bottom: 30px;
+                        display: flex;
+                        align-items: center;
+                        font-size: 14px;
+                        font-family: PingFangSC-Medium, PingFang SC;
+                        font-weight: 500;
+                        color: rgba(44, 53, 66, 0.85);
+                        line-height: 24px;
+                        cursor: pointer;
 
-                    .item-count {
-                        margin-left: 20px;
-                        width: 90px;
-                        flex-shrink: 0;
-                    }
+                        &:hover {
+                            color: $c1;
+                        }
 
-                    .item-per {
-                        min-width: 70px;
-                    }
+                        .item-name {
+                            margin-left: 5px;
+                            width: 80px;
+                            flex-shrink: 0;
+                        }
 
-                    .item-progress {
-                        margin-right: 15px;
-                        width: 100%;
-                        height: 24px;
-                        background: #e6f0ff;
-                        border-radius: 1px;
-                        overflow: hidden;
-                        b {
-                            display: block;
+                        .item-div {
+                            width: 1px;
+                            height: 12px;
+                            background: #d8d8d8;
+                            border-radius: 1px;
+                        }
+
+                        .item-count {
+                            margin-left: 20px;
+                            width: 90px;
+                            flex-shrink: 0;
+                        }
+
+                        .item-per {
+                            min-width: 70px;
+                        }
+
+                        .item-progress {
+                            margin-right: 15px;
+                            width: 100%;
                             height: 24px;
-                            background: #7ba6e6;
+                            background: #e6f0ff;
+                            border-radius: 1px;
+                            overflow: hidden;
+
+                            b {
+                                display: block;
+                                height: 24px;
+                                background: #7ba6e6;
+                            }
                         }
                     }
                 }
             }
-        }
-        ::v-deep .el-tabs__content {
-            overflow: scroll !important;
-            height: 100% !important;
+
+            ::v-deep .el-tabs__content {
+                overflow: scroll !important;
+                height: 100% !important;
+            }
         }
     }
-  }
-  
+
 }
 
 .m-tx {
-    margin-bottom: 13px;
-    width: 100%;
-    height:calc( 100vh - 430px);
+    // margin-bottom: 13px;
+    // width: 100%;
+    height: 200px;
     overflow: hidden;
-    padding-right: 5px;
-    box-sizing: border-box;
+    // padding-right: 5px;
+    // box-sizing: border-box;
+    // flex-grow: 1;
+    // overflow: hidden scroll; 
     .cnt {
         box-sizing: border-box;
         margin-top: 12px;
         border-radius: 2px;
-        overflow:hidden scroll ;
+        overflow: hidden scroll;
         height: calc(100% - 50px);
-        
+
         .empty {
             text-align: center;
             color: #999;
+
             img {
                 display: block;
                 width: 120px;
@@ -354,13 +495,17 @@
         .item {
             padding: 16px 0 7px;
             border-bottom: 1px dashed #f0f5fa;
+
             &:last-child {
                 border-bottom: none;
             }
+
             display: flex;
             align-items: center;
-            .item_right{
+
+            .item_right {
                 flex: 1;
+
                 .item-title {
                     @include toe;
                     height: 22px;
@@ -369,23 +514,29 @@
                     font-weight: 400;
                     color: rgba(0, 0, 0, 0.85);
                     line-height: 22px;
+                    margin-left: 10px;
+
                     &:hover {
                         color: $c1;
                         cursor: pointer;
                     }
                 }
+
                 .item-date {
                     font-size: 12px;
                     font-family: PingFangSC-Regular, PingFang SC;
                     font-weight: 400;
                     color: rgba(0, 0, 0, 0.45);
                     line-height: 17px;
+                    margin-left: 10px;
                 }
             }
-            .item_left{
+
+            .item_left {
                 width: 40px;
-                margin-right:15px;
-                .i-tag{
+                margin-right: 15px;
+
+                .i-tag {
                     display: block;
                     margin-right: 15px;
                     width: 40px;
@@ -401,13 +552,15 @@
                     font-weight: 600;
                 }
             }
-           
+
         }
     }
 }
-.m-tb {
-    height: 302px;
 
+.m-tb {
+    height: 238px;
+    display: flex;
+    flex-direction: column;
     .cnt {
         box-sizing: border-box;
         margin-top: 20px;
@@ -437,9 +590,11 @@
                 color: #333333;
                 line-height: 24px;
             }
+
             .item-btns {
                 margin-left: auto;
                 display: flex;
+
                 .item-btn {
                     display: flex;
                     align-items: center;
@@ -449,19 +604,23 @@
                     font-weight: 400;
                     color: $c1;
                     text-align: center;
+
                     &:hover {
                         color: $c1_on;
                         cursor: pointer;
                     }
+
                     &:last-child {
                         margin-right: 2px;
                     }
+
                     img {
                         display: block;
                         width: 15px;
                         height: 15px;
                         margin-right: 2px;
                     }
+
                     span {
                         display: block;
                     }
@@ -470,3 +629,48 @@
         }
     }
 }
+
+.table-container {
+    // max-height: 300px;
+    overflow-y: auto; 
+  }
+.table {
+    border-collapse: collapse;
+    width: 90%;
+    margin: 0 auto;
+    // height: auto; 
+    margin-top: 45px;
+}
+.table th,
+.table td {
+    border: 1px solid rgb(230, 230, 230);
+    padding: 8px;
+    text-align: center;
+}
+
+.table th {
+    background-color: #F5F7FB;
+    padding: 8px;
+    text-align: center;
+    width: 100px;
+}
+
+.row {
+    display: flex;
+}
+
+.cell {
+    border: 1px solid #F5F7FB;
+    padding: 8px;
+}
+
+.special-header {
+    background-color: #FFFCF1;
+    /* 设置特定表头的背景颜色为 #FFFCF1 */
+}
+
+.update-settings {
+    margin-right: 25px;
+    display: flex;
+    align-items: center;
+}
\ No newline at end of file
diff --git a/src/assets/scss/modules/management/form-main.scss b/src/assets/scss/modules/management/form-main.scss
index 392e9eb62..3417848c7 100644
--- a/src/assets/scss/modules/management/form-main.scss
+++ b/src/assets/scss/modules/management/form-main.scss
@@ -29,8 +29,15 @@
   .list_item_width_3 {
     width: 185px;
   }
-
-
+  .u-item-width-communitycascader{
+    width: 141px;
+  }
+  .u-item-width-buildcascader{
+    width: 96px;
+  }
+  .u-item-width-agency {
+    width: 200px;
+  }
   .item_width_5{
     width: 320px;
   }
diff --git a/src/assets/scss/modules/management/list-main.scss b/src/assets/scss/modules/management/list-main.scss
index d5be753c7..fbc44d3f7 100644
--- a/src/assets/scss/modules/management/list-main.scss
+++ b/src/assets/scss/modules/management/list-main.scss
@@ -28,7 +28,7 @@
     }
    //查询栏---分开的日期、时间范围的宽度
    .u-item-width-daterange{
-      width: 206px;
+      width: 209px;
     }
     //查询栏---后方带一个文字长度
    .u-item-width-normal-text{
@@ -62,7 +62,7 @@
       height: auto;
     }
     .u-item-width-service{
-      width: 218px;
+      width: 220px;
     }
   }
 
diff --git a/src/assets/scss/pages/resiAdd.scss b/src/assets/scss/pages/resiAdd.scss
new file mode 100644
index 000000000..5b97e2246
--- /dev/null
+++ b/src/assets/scss/pages/resiAdd.scss
@@ -0,0 +1,73 @@
+.div_form {
+    height: 100%;
+    padding:16px;
+    .item_width_1{
+        width: 498px;
+    }
+    .form{
+        background-color: #fff;
+        padding:16px;
+        .flex_box{
+            display: flex;
+            flex-wrap: wrap;
+            .flex_item_width1{
+                width: 332px;
+            }
+            .flex_item_width2{
+                width: 700px;
+            }
+            .flex_item_width3{
+                width: 120px;
+            }
+            .flex_item_width4{
+                width: 300px;
+                
+            }
+          
+        }
+    }
+}
+h5 {
+    position: relative;
+    font-size: 16px;
+    margin: 22px 0;
+    &::after {
+        content: "";
+        position: absolute;
+        display: inline-block;
+        left: -15px;
+        top: -0px;
+        width: 5px;
+        height: 16px;
+        background-color: #0056d6;
+    }
+}
+.basicInfo, .house, .expand {
+    ::v-deep .el-form-item{
+        margin-bottom: 24px;
+    }
+}
+.font-color-orange{
+    ::v-deep .el-form-item__label{
+     color:#ff5107 ;
+    }
+}
+.font-color-blue{
+    ::v-deep .el-form-item__label{
+     color:#3876f2;
+     position: relative;
+     &::before{
+        content: '*';
+        position: absolute;
+        top: 0px;
+        left: 16px;
+     }
+    }
+}
+.font-color-blue2{
+    ::v-deep .el-form-item__label{
+     &::before{
+        left: 2px;
+     }
+    }
+}
\ No newline at end of file
diff --git a/src/assets/scss/pages/resiInfo.scss b/src/assets/scss/pages/resiInfo.scss
new file mode 100644
index 000000000..63abec1b7
--- /dev/null
+++ b/src/assets/scss/pages/resiInfo.scss
@@ -0,0 +1,151 @@
+.g-main{
+    display: flex;
+    box-sizing: border-box;
+    height:auto;
+    padding: 24px 16px 0; 
+    .left{
+        min-width: 184px;
+        margin-right: 16px;
+        background: #ffffff;
+        .user{
+            display: flex;
+            flex-direction: column;
+            height: 120px;
+            justify-content: center;
+            align-items: center;
+            position: relative;
+            font-weight: bold;
+            color: #000000;
+            &::after{
+                content: '';
+                position: absolute;
+                bottom: 0;
+                left: 16px;
+                width: 152px;
+                height: 1px;
+                background: #EBEDF0;
+            }
+            img{
+               width: 50px;
+               height: 56px;
+               margin-bottom: 10px;
+            }
+
+        }
+        .menu{
+            .progress{
+                padding: 0 16px;
+                box-sizing: border-box;
+                .text{
+                    display: flex;
+                    justify-content: space-between;
+                    align-items: center;
+                    margin:9px 0px 11px 0px;
+                    font-size: 12px;
+                    >:nth-child(2){
+                    color: #0056D6;
+                    font-size: 14px;
+                    font-weight: bold;
+                   }
+                }
+            }
+            .list{
+                margin-top:14px ;
+               .item{
+                    margin-bottom: 8px;
+                    height: 38px;
+                    color: #333333;
+                    padding-left: 16px;
+                    cursor: pointer;
+                    line-height: 38px;
+                    .full{
+                        color: #0056d6;
+                    }
+                    .incomplete{
+                        color: #ff5107;
+                    }
+               } 
+              
+               .active{
+                    background: #F7FAFF;
+                    color: #0056D6 !important;
+                    position: relative;
+                    &::after{
+                        content: '';
+                        position: absolute;
+                        right: 0;
+                        width: 4px;
+                        height: 37px;
+                        background: #0056D6;
+                    }
+               }
+            }
+        }
+    }
+    .right{
+        flex: 1;
+        width: 100%;
+        height: 100%;
+        background: #ffffff;
+        position: relative;
+        padding-bottom: 16px;
+        .editBtn{
+            z-index: 10;
+            position: absolute;
+            right: 16px;
+            top: 16px;
+        }
+        .title-small{
+            font-size: 16px;
+            font-family: PingFang SC;
+            font-weight: bold;
+            color: #333333;
+            position: relative;
+            padding-left: 11px; 
+            margin-left: 0px;
+            margin-top: 22px;
+        }
+        .flex_box{
+            display: flex;
+            flex-wrap: wrap;
+
+            .f-flex{
+                margin-top: 23px; 
+                width: 332px;
+                align-items: center;
+                .f-label {
+                    width: 100px;
+                    text-align: right;
+                    color: rgba(51, 51, 51, .85) ;
+                    >b{
+                        font-weight: 400;
+                        position: relative;
+                        color: rgba(51, 51, 51, .85) ;
+        
+                        &::after{
+                            content: '*';
+                            position: absolute;
+                            top: 0px;
+                            color: #ff5107;
+                            left: -7px;
+                        }
+                    }
+                }
+            }
+           
+        }
+       
+        .f-labels{
+            width: 155px;
+            text-align: right;
+        }
+        .f-m-top23{
+            margin-top: 23px;
+        }
+    }
+}
+
+::v-deep .el-button--text{
+    padding: 0;
+}
+
diff --git a/src/assets/scss/pages/smartImport.scss b/src/assets/scss/pages/smartImport.scss
new file mode 100644
index 000000000..3a92756c9
--- /dev/null
+++ b/src/assets/scss/pages/smartImport.scss
@@ -0,0 +1,110 @@
+.m-detail-main {
+    padding: 20px 20px 0;
+    .title-small{
+        position: relative;
+        &::after{
+            content: '';
+            width: 4px;
+            height: 16px;
+            background-color: #0056d6;
+            position: absolute;
+            left: -20px;
+            top: 0px;
+        }
+    }
+  }
+.font_color_red{
+  color: red;
+}
+  .content_box{
+    display: flex;
+    .left{
+        width: 50%;
+        .rotate{
+             animation: rotate 5s infinite linear;
+        }
+        .u-item-width-normal{
+            width: 240px; 
+         }
+         .text-center{
+            width: calc( 100% - 20px);
+            height: 175px;
+            display: flex;
+            justify-content: center;
+            align-items: center;
+            .el-upload__text{
+                color: #c5c9d1;
+                width: 100%;
+            }
+            /deep/ .el-upload {
+              width: 100%;
+              .el-upload-dragger{
+                width: 100%;
+              }
+            }
+         }
+    }
+    .right{
+        padding: 15px;
+        width: 50%;
+        background: #f5f7fa;
+        border-radius: 3px;
+        h4{
+            margin-top: 0;
+            line-height: 19px;
+        }
+        .textBtn{
+            padding: 0px;
+            margin: 0 5px;     
+        }
+    }
+   
+  }
+  .steps {
+    width: 80%;
+    /deep/ .el-step__main {
+      position: absolute;
+      left: 24px;
+      top: -5px;
+      z-index: 10;
+      background: #fff;
+      width: 100px;
+      padding-left: 10px;
+    }
+    /deep/ .is-finish {
+      .el-step__icon {
+        background: #0056d6;
+        color: #fff;
+      }
+    }
+    /deep/ .is-process  {
+        color: #000;
+        font-weight: 400;
+        .el-step__icon {
+          background: #cbcbcb;
+          color: #fff;
+          border-color: #cbcbcb;
+        }
+      }
+      /deep/ .is-wait  {
+        color: #000;
+        .el-step__icon {
+          background: #cbcbcb;
+          color: #fff;
+          border-color: #cbcbcb;
+        }
+      }
+      /deep/ .el-step__description{
+        width: 300px;
+        color: #666666;
+      }
+      
+  }
+  @keyframes rotate {
+    from {
+      transform: rotate(0deg);
+    }
+    to {
+      transform: rotate(-360deg);
+    }
+  }
\ No newline at end of file
diff --git a/src/components/GridTree/nodeWrap.vue b/src/components/GridTree/nodeWrap.vue
index 0ef7fe6a9..2032ddd83 100644
--- a/src/components/GridTree/nodeWrap.vue
+++ b/src/components/GridTree/nodeWrap.vue
@@ -62,6 +62,7 @@
   </div>
 </template>
 <script>
+import { requestGet } from "@/js/dai/request";
 export default {
   props: ["nodeConfig"],
   data() {
@@ -108,8 +109,29 @@ export default {
         }
       }
     },
-    getChildrenData(item, idx, arr) {
-      arr.forEach((element, index) => {
+   async getChildrenData(item, idx, arr) {
+      if(item.level === "building_chief"){
+        let url = '/gov/org/organizational/neighborhood/getUnitGridOrgTreeList'
+        let parm = {
+          bulidingId:item.id
+        }
+        const {data,code,msg} = await requestGet(url,parm)
+        if(code === 0){
+          arr.forEach((element, index) => {
+        if (index === idx) {
+          if (element.children) {
+            element._children = data;
+            element.children = null;
+          } else {
+            element.children = data;
+          }
+        } else {
+          element.children = null;
+        }
+      });
+        }
+      }else{
+        arr.forEach((element, index) => {
         if (index === idx) {
           if (element.children) {
             element._children = element.children;
@@ -121,6 +143,7 @@ export default {
           element.children = null;
         }
       });
+      }
     },
     gotoPersonnel(item) {
       const grandPid = this.findParentParentId(this.nodeConfig, item.pid);
diff --git a/src/components/JwTree/nodeWrap.vue b/src/components/JwTree/nodeWrap.vue
index f7ef6ef24..6b2ebd227 100644
--- a/src/components/JwTree/nodeWrap.vue
+++ b/src/components/JwTree/nodeWrap.vue
@@ -18,28 +18,29 @@
                 <div class="auto-judge">
                   <div v-if="getOnerSixLevelFlag(item)">
                     <div :class="[item.children && item.children.length > 0 ? 'wgdzbHover' : 'wgdzb']">
-                      <nameSplit :item="item" areaName="organizationName" peopleName="name" pageName="居委组织架构" />
+                      <nameSplit :item="item" areaName="organizationName" peopleName="name" />
                     </div>
-                    <div v-if="item._children" style="text-align: center; cursor: pointer" @click="getChildrenData(item, index, nodeConfig.children)">
-                      <img v-if="item.children && item.children.length > 0" :src="require('@/assets/images/home/sh.png')" alt="" />
+                    <div v-if="item.childCount>0" style="text-align: center; cursor: pointer" @click="getChildrenData(item, index, nodeConfig.children)">
+                      <img v-if=" item.zkFlag" :src="require('@/assets/images/home/sh.png')" alt="" />
                       <img v-else :src="require('@/assets/images/home/zk.png')" alt="" />
                     </div>
                   </div>
                   <div v-if="item.level === 'building_chief'">
                     <div :class="[item.children && item.children.length > 0 ? 'lydxzHover' : 'lydxz']">
-                      <nameSplit :item="item" areaName="organizationName" peopleName="name" pageName="居委组织架构" />
+                      <nameSplit :item="item" areaName="organizationName" peopleName="name" />
                     </div>
-                    <div v-if="item._children" style="text-align: center; cursor: pointer" @click="getChildrenData(item, index, nodeConfig.children)">
-                      <img v-if="item.children && item.children.length > 0" :src="require('@/assets/images/home/sh.png')" alt="" />
+                    <div v-if="item.childCount>0" style="text-align: center; cursor: pointer" @click="getChildrenData(item, index, nodeConfig.children)">
+                      <img v-if=" item.zkFlag " :src="require('@/assets/images/home/sh.png')" alt="" />
                       <img v-else :src="require('@/assets/images/home/zk.png')" alt="" />
                     </div>
                   </div>
-                  <div v-if="item.level === 'unit_chief' || item.level === 'public_welfare_post'">
-                    <div @click="gotoPersonnel(item.resiId, '居委组织架构')" :class="[item.children && item.children.length > 0 ? 'dyzxhHover' : 'dyzxh', 'gotoDesc']" :title="item.organizationName">
-                      {{ spliceNameFun(item.organizationName, 3) }}
+                  <div v-if="item.level === 'unit_chief'|| item.level === 'public_welfare_post'">
+                    <div @click="gotoPersonnel(item.resiId, '居委组织架构')" :class="[item.categoryWarn === 'red' ? 'dyzxhRed' : item.categoryWarn === 'yellow' ? 'dyzxhYellow' : item.categoryWarn === 'green' ? 'dyzxhGreen' : '', item.children && item.children.length > 0 ? 'dyzxhHover' : 'dyzxh']" :title="item.organizationName">
+                      <!-- {{ spliceNameFun(item.organizationName, 3) }} -->
+                      {{ item.organizationName }}
                     </div>
-                    <div v-if="item._children" style="text-align: center; cursor: pointer" @click="getChildrenData(item, index, nodeConfig.children)">
-                      <img v-if="item.children && item.children.length > 0" :src="require('@/assets/images/home/sh.png')" alt="" />
+                    <div v-if="item.childCount>0" style="text-align: center; cursor: pointer" @click="getChildrenData(item, index, nodeConfig.children)">
+                      <img v-if=" item.zkFlag" :src="require('@/assets/images/home/sh.png')" alt="" />
                       <img v-else :src="require('@/assets/images/home/zk.png')" alt="" />
                     </div>
                   </div>
@@ -61,6 +62,7 @@
   </div>
 </template>
 <script>
+import { requestGet } from "@/js/dai/request";
 export default {
   props: ["nodeConfig"],
   data() {
@@ -69,7 +71,9 @@ export default {
       sixLevelArr: ["province", "city", "district", "street", "community", "grid_manager"],
     };
   },
-  mounted() {},
+  mounted() {
+   
+  },
   computed: {},
   watch: {},
   methods: {
@@ -84,24 +88,59 @@ export default {
       return this.sixLevelArr.includes(item.level);
     },
 
-    getChildrenData(item, idx, arr) {
-      arr.forEach((element, index) => {
+    async getChildrenData(item, idx, arr) {
+      if(item.level != "street"){
+        let url = '/gov/org/organizational/neighborhood/getNeighborhoodCommitteeOrgTreeListByLevel'
+        let parm = {
+          orgId:item.id,
+          level:item.level
+        }
+        const {data,code,msg} = await requestGet(url,parm)
+        if(code === 0){
+          this.$EventBus.$emit('handelClickJWNode',data)
+          data.forEach(item=>{
+            item.zkFlag = !item.childCount>0
+            item.children = null
+          })
+          arr.forEach((element, index) => {
+          if (index === idx) {
+            if (element.children) {
+              console.log(item);
+              element.zkFlag = false;
+              element.children = null;
+            } else {
+              element.zkFlag = true;
+              element.children = data;
+            }
+          } else {
+            element.children = null;
+            element.zkFlag = false;
+          }
+        });
+        }
+      }else{
+        arr.forEach((element, index) => {
         if (index === idx) {
           if (element.children) {
-            element._children = element.children;
+            element.zkFlag = false;
+            element._children = element.children
             element.children = null;
           } else {
+            element.zkFlag = true;
             element.children = element._children;
           }
         } else {
           element.children = null;
+          element.zkFlag = false;
         }
       });
+      }
+  
     },
-
+    
     gotoPersonnel(id, name) {
       if (id) {
-        this.$router.push(`/organizational/orgPersonnel/${name}`);
+        this.$router.push({ path: `/organizational/orgPersonnel/${name}`, query: { user_id: id } });
       } else {
         this.$message({
           message: "无法跳转",
diff --git a/src/components/NameSplit/index.vue b/src/components/NameSplit/index.vue
index 4bf9111d9..d5f747ac4 100644
--- a/src/components/NameSplit/index.vue
+++ b/src/components/NameSplit/index.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="node-com">
-    <div v-if="!flag" class="nodeTitle" :title="getAllName(item[areaName])">{{ spliceNameFun(item[areaName], 7) }}</div>
+    <div v-if="!flag" class="nodeTitle" >{{ getAllName(item[areaName]) }}</div>
     <div class="name_more peoName" v-if="item[peopleName] && !item[peopleName].includes(',')" @click="gotoPersonnel(item.resiId)" :title="getAllName(item[peopleName])">{{ spliceNameFun(item[peopleName], 12) }}</div>
     <div class="name_more" v-if="item[peopleName] && item[peopleName].includes(',')">
       <span v-for="(i, k) in getItemNameArr(item[peopleName])" :key="i" @click="gotoPersonnel(item.resiId.split(',')[k])" :title="getAllName(i)">{{ spliceNameFun(i, 12) }}{{ k === getItemNameArr(item[peopleName]).length - 1 ? "" : "," }}</span>
diff --git a/src/components/ren-dept-tree/src/ren-dept-tree.vue b/src/components/ren-dept-tree/src/ren-dept-tree.vue
index 461aed181..39db795f5 100644
--- a/src/components/ren-dept-tree/src/ren-dept-tree.vue
+++ b/src/components/ren-dept-tree/src/ren-dept-tree.vue
@@ -1,13 +1,13 @@
 <template>
   <div>
-  <el-input v-model="showDeptName" :placeholder="placeholder" @focus="deptDialog">
+  <el-input v-model.trim="showDeptName" :placeholder="placeholder" @focus="deptDialog">
     <el-button slot="append" icon="el-icon-search" @click="deptDialog"></el-button>
   </el-input>
   <el-input :value="value" style="display: none"></el-input>
   <el-dialog :visible.sync="visibleDept" width="30%" :modal="false" :title="placeholder" :close-on-click-modal="false" :close-on-press-escape="false">
     <el-form size="mini" :inline="true">
       <el-form-item :label="$t('keyword')">
-        <el-input v-model="filterText"></el-input>
+        <el-input v-model.trim="filterText"></el-input>
       </el-form-item>
       <el-form-item>
         <el-button type="default">{{ $t('query') }}</el-button>
diff --git a/src/components/ren-process-running/src/ren-task-back.vue b/src/components/ren-process-running/src/ren-task-back.vue
index d95da4e22..cc2cbda79 100644
--- a/src/components/ren-process-running/src/ren-task-back.vue
+++ b/src/components/ren-process-running/src/ren-task-back.vue
@@ -2,7 +2,7 @@
   <el-dialog :visible.sync="visible" :title="$t('process.doBackRollback')" :close-on-click-modal="false" :close-on-press-escape="false">
     <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" :label-width="$i18n.locale === 'en-US' ? '120px' : '80px'">
       <el-form-item :label="$t('process.comment')" prop="comment">
-            <el-input type="textarea" v-model="dataForm.comment" :placeholder="$t('process.comment')"></el-input>
+            <el-input type="textarea" v-model.trim="dataForm.comment" :placeholder="$t('process.comment')"></el-input>
       </el-form-item>
     </el-form>
     <template slot="footer">
diff --git a/src/components/ren-process-running/src/ren-task-entrust.vue b/src/components/ren-process-running/src/ren-task-entrust.vue
index 4c4b7381a..4b6d49c79 100644
--- a/src/components/ren-process-running/src/ren-task-entrust.vue
+++ b/src/components/ren-process-running/src/ren-task-entrust.vue
@@ -2,7 +2,7 @@
   <el-dialog :visible.sync="visible" :title="$t('process.entrustTask')" :close-on-click-modal="false" :close-on-press-escape="false">
     <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" :label-width="$i18n.locale === 'en-US' ? '120px' : '80px'">
       <el-form-item :label="$t('process.assignee')">
-        <el-input v-model="dataForm.entrustUserName" class="input-with-select">
+        <el-input v-model.trim="dataForm.entrustUserName" class="input-with-select">
           <el-button slot="append" icon="el-icon-search" @click="selectUserInfo()"></el-button>
         </el-input>
       </el-form-item>
diff --git a/src/components/ren-process-running/src/ren-task-handle.vue b/src/components/ren-process-running/src/ren-task-handle.vue
index f4a9d4d58..8616c684a 100644
--- a/src/components/ren-process-running/src/ren-task-handle.vue
+++ b/src/components/ren-process-running/src/ren-task-handle.vue
@@ -2,7 +2,7 @@
   <el-dialog :visible.sync="visible" :title="handleTitle" :close-on-click-modal="false" :close-on-press-escape="false">
     <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" :label-width="$i18n.locale === 'en-US' ? '120px' : '80px'">
       <el-form-item :label="$t('process.comment')" prop="comment">
-        <el-input type="textarea" v-model="dataForm.comment" :placeholder="$t('process.comment')"></el-input>
+        <el-input type="textarea" v-model.trim="dataForm.comment" :placeholder="$t('process.comment')"></el-input>
       </el-form-item>
     </el-form>
     <template slot="footer">
diff --git a/src/components/ren-process-running/src/select-user.vue b/src/components/ren-process-running/src/select-user.vue
index e139e2862..35e59db12 100644
--- a/src/components/ren-process-running/src/select-user.vue
+++ b/src/components/ren-process-running/src/select-user.vue
@@ -3,7 +3,7 @@
     <div class="mod-sys__user">
       <el-form :inline="true" size="mini" :model="dataForm" @keyup.enter.native="getDataList()">
         <el-form-item>
-          <el-input v-model="dataForm.username" :placeholder="$t('user.username')" clearable></el-input>
+          <el-input v-model.trim="dataForm.username" :placeholder="$t('user.username')" clearable></el-input>
         </el-form-item>
         <el-form-item>
           <el-button @click="getDataList()">{{ $t('query') }}</el-button>
diff --git a/src/components/ren-region-tree/src/ren-region-tree.vue b/src/components/ren-region-tree/src/ren-region-tree.vue
index 8f8105741..29192965c 100644
--- a/src/components/ren-region-tree/src/ren-region-tree.vue
+++ b/src/components/ren-region-tree/src/ren-region-tree.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="ren-region">
-    <el-input v-model="showName"
+    <el-input v-model.trim="showName"
               :placeholder="placeholder"
               @focus="treeDialog">
       <el-button slot="append"
@@ -18,7 +18,7 @@
       <el-form size="mini"
                :inline="true">
         <el-form-item :label="$t('keyword')">
-          <el-input v-model="filterText"></el-input>
+          <el-input v-model.trim="filterText"></el-input>
         </el-form-item>
         <el-form-item>
           <el-button type="default">{{ $t('query') }}</el-button>
diff --git a/src/js/columns/constants/index.js b/src/js/columns/constants/index.js
index 9ba80e489..2fb8f7966 100644
--- a/src/js/columns/constants/index.js
+++ b/src/js/columns/constants/index.js
@@ -2,13 +2,17 @@
  * @Author: mk 2403457699@qq.com
  * @Date: 2023-08-01 10:13:40
  * @LastEditors: mk 2403457699@qq.com
- * @LastEditTime: 2023-08-04 18:02:54
+ * @LastEditTime: 2024-02-27 19:04:44
  * @Description: 此文件针对于本地字典,常用的男女或者是否一类需要在前端写的可以在此文件中添加
  *
  *
  */
 // constants.js
 export const genderList = [
+  {
+    label: '未知',
+    value: '0'
+  },
   {
     label: '男',
     value: '1'
@@ -49,6 +53,16 @@ export const disabilityFlagList = [
     value: 0
   }
 ]
+export const hasOptions = [
+  {
+    label: '有',
+    value: 1
+  },
+  {
+    label: '无',
+    value: 0
+  }
+]
 export const dormitoryTypeList = [
   {
     label: '楼长',
diff --git a/src/main.js b/src/main.js
index 06a255397..06b3688d0 100644
--- a/src/main.js
+++ b/src/main.js
@@ -2,7 +2,7 @@
  * @Author: mk 2403457699@qq.com
  * @Date: 2022-12-16 09:05:10
  * @LastEditors: mk 2403457699@qq.com
- * @LastEditTime: 2023-08-10 16:49:19
+ * @LastEditTime: 2024-05-07 15:54:09
  * @Description: 全局挂载提示信息,避免同时出现多条信息
  *
  *
@@ -38,12 +38,17 @@ import util from "@js/util";
 import Moment from "moment";
 import getQueryPara from "dai-js/modules/getQueryPara";
 import NodeWrap from "@/components/Tree/nodeWrap.vue";
+import 'quill/dist/quill.core.css'
+import 'quill/dist/quill.snow.css'
+import 'quill/dist/quill.bubble.css'
 // import AddNode from "@/components/Tree/addNode.vue";
 import NodeWrapJw from "@/components/JwTree/nodeWrap.vue";
 import NodeWrapGrid from "@/components/GridTree/nodeWrap.vue";
 import PopTips from "@/components/PopTips/index.vue";
 import PopHomeTip from "@/components/PopHomeTip/index.vue";
 import NameSplit from "@/components/NameSplit/index.vue";
+import RelationGraph from "relation-graph";
+
 // import AddNodeJw from "@/components/JwTree/addNode.vue";
 //按钮
 Vue.component("nodeWrap", NodeWrap);
@@ -76,6 +81,7 @@ Vue.use(Element, {
   size: "default",
   i18n: (key, value) => i18n.t(key, value),
 });
+Vue.use(RelationGraph);
 
 Vue.prototype.$message = message;
 Vue.prototype.$moment = Moment;
diff --git a/src/router/index.js b/src/router/index.js
index 96f637e42..e06a7a6f3 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -98,6 +98,26 @@ export const moduleRoutes = {
         ],
       },
     },
+    {
+      path: "notice-version",
+      props: true,
+      name: "notice-version",
+      component: () => import("@/views/modules/home/cpts/notice_version_update"),
+      meta: {
+        isTab: true,
+        title: "版本更新",
+      },
+    },
+    {
+      path: "base-nonIntResi",
+      props: true,
+      name: "base-nonIntResi",
+      component: () => import("@/views/modules/base/nonIntResi/nonIntResi"),
+      meta: {
+        isTab: true,
+        title: "信息不完整",
+      },
+    },
     {
       path: "shequ-chaxun",
       props: true,
@@ -119,10 +139,10 @@ export const moduleRoutes = {
       },
     },
     {
-      path: "fangwu-huaxiang",
+      path: "house-huaxiang",
       props: true,
-      name: "fangwu-huaxiang",
-      component: () => import("@/views/modules/portrayal/fangwu/index"),
+      name: "house-huaxiang",
+      component: () => import("@/views/modules/portrayal/house/index"),
       meta: {
         isTab: true,
         title: "",
@@ -137,7 +157,27 @@ export const moduleRoutes = {
           isTab: true,
           title: "",
         },
-      }
+      },
+      {
+        path: "add-resi",
+        props: true,
+        name: "add-resi",
+        component: () => import("@/views/components/addResi"),
+          meta: {
+            isTab: true,
+            title: "新增居民",
+          },
+        },
+        {
+          path: "edit-resi",
+          props: true,
+          name: "edit-resi",
+          component: () => import("@/views/components/editResi"),
+            meta: {
+              isTab: true,
+              title: "编辑居民",
+            },
+          }
   ],
 };
 // pc端菜单的 如果没有配置 默认的 或者配置了默认的 但没有权限 默认选中第一
@@ -912,6 +952,10 @@ router.beforeEach((to, from, next) => {
     to.meta.title = store.state.huaXiang.userInfo.name
     return next();
   }
+  if (to.name === 'house-huaxiang') {
+    to.meta.title = store.state.huaXiang.houseInfo.houseName
+    return next();
+  }
   if (to.name === 'fangwu-huaxiang') {
     to.meta.title = store.state.huaXiang.houseInfo.doorName
     return next();
diff --git a/src/views/components/CForm.vue b/src/views/components/CForm.vue
index b21b1eecf..8c5f6bc96 100644
--- a/src/views/components/CForm.vue
+++ b/src/views/components/CForm.vue
@@ -19,7 +19,7 @@
                   :style="{width:column.itemWidth?column.itemWidth:itemWidth}">{{column.format?column.format(model[column.key]):model[column.key]}}</span>
             <el-input v-else-if="column.type === 'input'"
                       v-show="column.showFlag==='1' ? column.show : true"
-                      v-model="model[column.key]"
+                      v-model.trim="model[column.key]"
                       :readonly="column.readonly?column.readonly:false"
                       :disabled="column.disabled?column.disabled:false"
                       :placeholder="column.placeholder?column.placeholder:column.title"
@@ -32,7 +32,7 @@
             <el-input v-if="column.type === 'password'"
                       type="password"
                       v-show="column.showFlag==='1' ? column.show : true"
-                      v-model="model[column.key]"
+                      v-model.trim="model[column.key]"
                       :readonly="column.readonly?column.readonly:false"
                       :disabled="column.disabled?column.disabled:false"
                       :placeholder="column.placeholder?column.placeholder:column.title"
@@ -106,7 +106,7 @@
             <!--计数器-->
             <el-input-number v-else-if="column.type === 'counter'"
                              v-show="column.showFlag==='1' ? column.show : true"
-                             v-model="model[column.key]"
+                             v-model.trim="model[column.key]"
                              :step="column.option&&column.option.step?column.option.step:1"
                              :min="column.option&&column.option.min?column.option.min:0"
                              :max="column.option&&column.option.max?column.option.max:100"
@@ -117,7 +117,7 @@
             <!--单选按钮组-->
             <el-radio-group v-else-if="column.type === 'radio'"
                             v-show="column.showFlag==='1' ? column.show : true"
-                            v-model="model[column.key]"
+                            v-model.trim="model[column.key]"
                             :disabled="column.disabled?column.disabled:false"
                             :style="{width:column.itemWidth?column.itemWidth:itemWidth}">
               <el-radio v-for="item in optionData[column.key]"
@@ -129,7 +129,7 @@
             <!--多选按钮组-->
             <el-checkbox-group v-else-if="column.type === 'checkbox'"
                                v-show="column.showFlag==='1' ? column.show : true"
-                               v-model="model[column.key]"
+                               v-model.trim="model[column.key]"
                                :min="0"
                                :max="8"
                                :style="{width:column.itemWidth?column.itemWidth:itemWidth}">
@@ -142,7 +142,7 @@
             <!--下拉列表-->
             <el-select v-else-if="column.type === 'select'"
                        v-show="column.showFlag==='1' ? column.show : true"
-                       v-model="model[column.key]"
+                       v-model.trim="model[column.key]"
                        clearable
                        :disabled="column.disabled?column.disabled:false"
                        :filterable="column.filterable?column.filterable:false"
@@ -158,7 +158,7 @@
             <!-- 终端管理特殊下拉列表 -->
             <el-select v-else-if="column.type === 'select1'"
                        v-show="column.showFlag==='1' ? column.show : true"
-                       v-model="model[column.key]"
+                       v-model.trim="model[column.key]"
                        clearable
                        :filterable="column.filterable?column.filterable:false"
                        :placeholder="column.placeholder?column.placeholder:column.title"
@@ -173,7 +173,7 @@
             <!--布控级别下拉列表-->
             <!-- <el-select v-else-if="column.type === 'select1'"
                        v-show="column.showFlag==='1' ? column.show : true"
-                       v-model="model[column.key]"
+                       v-model.trim="model[column.key]"
                        clearable
                        :filterable="column.filterable?column.filterable:false"
                        :placeholder="column.placeholder?column.placeholder:column.title"
@@ -190,7 +190,7 @@
             <!--多选下拉列表-->
             <el-select v-else-if="column.type === 'multselect'"
                        v-show="column.showFlag==='1' ? column.show : true"
-                       v-model="model[column.key]"
+                       v-model.trim="model[column.key]"
                        multiple
                        :placeholder="column.placeholder?column.placeholder:column.title"
                        :style="{width:column.itemWidth?column.itemWidth:itemWidth}">
@@ -208,7 +208,7 @@
                         placement="bottom"
                         style="padding:0px"
                         :width="column.itemWidth?column.itemWidth:itemWidth"
-                        v-model="imgPopVisible"
+                        v-model.trim="imgPopVisible"
                         trigger="click">
 
               <div v-for="item in optionData[column.key]"
@@ -235,7 +235,7 @@
             <!--switch开关-->
             <el-switch v-else-if="column.type === 'switch'"
                        v-show="column.showFlag==='1' ? column.show : true"
-                       v-model="model[column.key]"
+                       v-model.trim="model[column.key]"
                        active-color="#13ce66"
                        inactive-color="#ff4949"
                        :disabled="column.disabled?column.disabled:false">
@@ -251,12 +251,12 @@
                       resize="none"
                       :style="{width:column.itemWidth?column.itemWidth:itemWidth}"
                       :placeholder="column.placeholder?column.placeholder:column.title"
-                      v-model="model[column.key]">
+                      v-model.trim="model[column.key]">
             </el-input>
             <!--日期选择器-->
             <el-date-picker v-else-if="column.type === 'date'"
                             v-show="column.showFlag==='1' ? column.show : true"
-                            v-model="model[column.key]"
+                            v-model.trim="model[column.key]"
                             type="date"
                             format="yyyy-MM-dd"
                             value-format="yyyy-MM-dd"
@@ -268,7 +268,7 @@
             <!--月份选择器-->
             <el-date-picker v-else-if="column.type === 'month'"
                             v-show="column.showFlag==='1' ? column.show : true"
-                            v-model="model[column.key]"
+                            v-model.trim="model[column.key]"
                             type="month"
                             format="yyyy-MM"
                             value-format="yyyy-MM"
@@ -280,7 +280,7 @@
             <!--日期时间选择器-->
             <el-date-picker v-else-if="column.type === 'datetime'"
                             v-show="column.showFlag==='1' ? column.show : true"
-                            v-model="model[column.key]"
+                            v-model.trim="model[column.key]"
                             type="datetime"
                             format="yyyy-MM-dd HH:mm:ss"
                             value-format="yyyy-MM-dd HH:mm:ss"
@@ -292,7 +292,7 @@
             <!--时间选择器-->
             <el-time-picker v-else-if="column.type === 'time'"
                             v-show="column.showFlag==='1' ? column.show : true"
-                            v-model="model[column.key]"
+                            v-model.trim="model[column.key]"
                             type="time"
                             format="HH:mm:ss"
                             value-format="HH:mm:ss"
@@ -303,7 +303,7 @@
             <!--日期区域选择器-->
             <el-date-picker v-else-if="column.type === 'daterange'"
                             v-show="column.showFlag==='1' ? column.show : true"
-                            v-model="model[column.key]"
+                            v-model.trim="model[column.key]"
                             type="daterange"
                             range-separator="至"
                             start-placeholder="开始日期"
@@ -316,7 +316,7 @@
             <!--日期时间区域选择器-->
             <el-date-picker v-else-if="column.type === 'datetimerange'"
                             v-show="column.showFlag==='1' ? column.show : true"
-                            v-model="model[column.key]"
+                            v-model.trim="model[column.key]"
                             type="datetimerange"
                             range-separator="至"
                             start-placeholder="开始日期"
@@ -340,14 +340,14 @@
                      id="file"
                      @change="getFile($event)" />
               <!-- <el-input type=file
-                        :v-model="model[column.key]"></el-input> -->
+                        :v-model.trim="model[column.key]"></el-input> -->
             </template>
             <!-- 级联选择器-->
             <el-cascader v-else-if="column.type === 'cascader'"
                          clearable
                          filterable
                          size="medium"
-                         v-model="model[column.key]"
+                         v-model.trim="model[column.key]"
                          :placeholder="column.placeholder?column.placeholder:column.title"
                          :style="{width:column.itemWidth?column.itemWidth:itemWidth}"
                          :options="optionData[column.key]"
diff --git a/src/views/components/CTable.vue b/src/views/components/CTable.vue
index f5d2a8ee6..f1b3f908b 100644
--- a/src/views/components/CTable.vue
+++ b/src/views/components/CTable.vue
@@ -29,7 +29,7 @@
                          center>
           <template slot-scope="scope">
             <el-radio :label="scope.row.id"
-                      v-model="templateRadio"
+                      v-model.trim="templateRadio"
                       @change.native="getRadioRow(scope.$index,scope.row)">&nbsp;</el-radio>
           </template>
         </el-table-column>
diff --git a/src/views/components/CTableNoPage.vue b/src/views/components/CTableNoPage.vue
index a3f193c9b..d5a4161ab 100644
--- a/src/views/components/CTableNoPage.vue
+++ b/src/views/components/CTableNoPage.vue
@@ -29,7 +29,7 @@
                          center>
           <template slot-scope="scope">
             <el-radio :label="scope.row.id"
-                      v-model="templateRadio"
+                      v-model.trim="templateRadio"
                       @change.native="getRadioRow(scope.$index,scope.row)">&nbsp;</el-radio>
           </template>
         </el-table-column>
diff --git a/src/views/components/CTree.vue b/src/views/components/CTree.vue
index 83aff7cf0..1d408d111 100644
--- a/src/views/components/CTree.vue
+++ b/src/views/components/CTree.vue
@@ -3,7 +3,7 @@
   <div class="el-tree-node">
     <div class="filter-input">
       <el-input placeholder="输入关键字进行过滤"
-                v-model="filterText"
+                v-model.trim="filterText"
                 clearable>
       </el-input>
     </div>
diff --git a/src/views/components/CTreeDialogSingle.vue b/src/views/components/CTreeDialogSingle.vue
index 24373b6e0..9362c4666 100644
--- a/src/views/components/CTreeDialogSingle.vue
+++ b/src/views/components/CTreeDialogSingle.vue
@@ -6,7 +6,7 @@
 
     <el-input readonly
               style="width:100%"
-              v-model="inputValue"
+              v-model.trim="inputValue"
               :placeholder="placeholder">
 
       <el-button slot="append"
diff --git a/src/views/components/addResi.vue b/src/views/components/addResi.vue
new file mode 100644
index 000000000..d51d3f3d4
--- /dev/null
+++ b/src/views/components/addResi.vue
@@ -0,0 +1,1413 @@
+<template>
+    <div class="div_form">
+        <div class="form">
+            <el-form :model="form" :rules="rules" label-width="105px" ref="addForm">
+                <h5 style="margin-top: 6px;">基础信息登记</h5>
+                <div class="flex_box">
+                            <el-form-item label="姓名" prop="baseInfoDto.name" class="font-color-orange flex_item_width1">
+                                <el-input class="list_item_width_1" v-model.trim="form.baseInfoDto.name" placeholder="请输入内容"
+                                    size="small" clearable></el-input>
+                            </el-form-item>
+                      
+                            <el-form-item label="证件类型" prop="baseInfoDto.idType" class="font-color-orange flex_item_width1">
+                                <el-select v-model.trim="form.baseInfoDto.idType" placeholder="请选择" size="small"
+                                    class="list_item_width_1" clearable>
+                                    <el-option v-for="(item, index) in idTypeList" :key="index" :label="item.label"
+                                        :value="item.value" @click.native="handelCLickIdType(item.value)"></el-option>
+                                </el-select>
+                            </el-form-item>
+                      
+                            <el-form-item label="证件号" prop="baseInfoDto.idNum" class="font-color-orange flex_item_width1">
+                                <el-input v-model.trim="form.baseInfoDto.idNum" placeholder="请输入内容" clearable size="small"
+                                    class="list_item_width_1" @blur="handleValidBlur"></el-input>
+                            </el-form-item>
+                        
+                            <el-form-item label="国籍" prop="baseInfoDto.nationality" class="font-color-orange flex_item_width1">
+                                <el-select v-model.trim="form.baseInfoDto.nationality" placeholder="请选择" size="small"
+                                    class="list_item_width_1" clearable>
+                                    <el-option v-for="(item, index) in dicts.nationalityList" :key="index"
+                                        :label="item.label" :value="item.value"></el-option>
+                                </el-select>
+                            </el-form-item>
+                  
+                            <el-form-item label="联系电话" prop="baseInfoDto.mobile" class="font-color-orange flex_item_width1">
+                                <el-input class="list_item_width_1" v-model.trim="form.baseInfoDto.mobile"
+                                    placeholder="请输入内容" size="small" clearable></el-input>
+                            </el-form-item>
+                       
+                            <el-form-item label="性别" class="flex_item_width1">
+                                <el-select v-model.trim="form.baseInfoDto.gender" placeholder="请选择" size="small"
+                                    class="list_item_width_1" clearable>
+                                    <el-option v-for="(item, index) in genderList" :key="index" :label="item.label"
+                                        :value="item.value"></el-option>
+                                </el-select>
+                            </el-form-item>
+                      
+                            <el-form-item label="出生日期" class="flex_item_width1">
+                                <el-date-picker v-model.trim="form.baseInfoDto.birthday" class="list_item_width_1"
+                                    type="date" size="small" clearable placeholder="选择日期" format="yyyy 年 MM 月 dd 日"
+                                    value-format="yyyy-MM-dd">
+                                </el-date-picker>
+                            </el-form-item>
+                      
+                            <el-form-item label="民族" class="flex_item_width1">
+                                <el-select v-model.trim="form.baseInfoDto.nation" placeholder="请选择" size="small"
+                                    class="list_item_width_1" clearable>
+                                    <el-option v-for="(item, index) in dicts.nationList" :key="index"
+                                        :label="item.label" :value="item.value"></el-option>
+                                </el-select>
+                            </el-form-item>
+                      
+                            <el-form-item label="文化程度" class="flex_item_width1">
+                                <el-select v-model.trim="form.eduInfoDto.cultureLevel" placeholder="请选择" size="small"
+                                    class="list_item_width_1" clearable>
+                                    <el-option v-for="(item, index) in dicts.educationList" :key="index"
+                                        :label="item.label" :value="item.value"></el-option>
+                                </el-select>
+                            </el-form-item>
+                        
+                            <el-form-item label="婚姻状况" class="flex_item_width1">
+                                <el-select v-model.trim="form.familyInfoDto.marriage" placeholder="请选择" size="small"
+                                    class="list_item_width_1" clearable>
+                                    <el-option v-for="(item, index) in dicts.marriageList" :key="index"
+                                        :label="item.label" :value="item.value"
+                                        @click.native="handelClickMarriage(item.value)"></el-option>
+                                </el-select>
+                            </el-form-item>
+                            <el-form-item label="配偶情况"  v-if="form.familyInfoDto.marriage == 'chuhun' || form.familyInfoDto.marriage == 'zaihun' || form.familyInfoDto.marriage == 'fuhun'" class="flex_item_width1">
+                                <el-select v-model.trim="form.familyInfoDto.spouseSituation" placeholder="请选择" size="small"
+                                    class="list_item_width_1" clearable>
+                                    <el-option v-for="(item, index) in dicts.spouseSituationList" :key="index"
+                                        :label="item.label" :value="item.value"></el-option>
+                                </el-select>
+                            </el-form-item>
+                            <el-form-item label="籍贯" class="flex_item_width1">
+                                <el-input v-model.trim="form.baseInfoDto.nativePlace" placeholder="请输入内容" clearable
+                                    size="small" class="list_item_width_1"></el-input>
+                                <el-radio v-model.trim="form.baseInfoDto.localResidenceFlag" style="margin-left: 10px;"
+                                    @click.native="handleLocalRadio($event)" :label="1">本地</el-radio>
+                            </el-form-item>
+                    <el-form-item label="备注" class="flex_item_width2" >
+                        <el-input type="textarea" class="item_width_1" :rows="3" placeholder="请输入内容"
+                            v-model.trim="form.baseInfoDto.remark" clearable>
+                        </el-input>
+                    </el-form-item>
+                </div>
+                <h5>居住信息登记</h5>
+                    <section v-for="(item, index) in this.form.resideInfoDtos" :key="index" >
+                               <div class="flex_box">
+                                <el-form-item label="所属组织" class="font-color-orange flex_item_width1"
+                                    :prop="`resideInfoDtos[${index}].gridId`" :rules="[
+                                    { required: true, message: '请选择所属组织', trigger: 'blur' },
+                                ]">
+                                    <el-cascader class="list_item_width_1" ref="myCascader" clearable size="small"
+                                        v-model.trim="form.resideInfoDtos[index].gridId" :options="orgOptions"
+                                        :props="orgOptionProps" @change="handleChangeAgency(index)"></el-cascader>
+                                </el-form-item>
+                          
+                                <el-form-item :prop="`resideInfoDtos[${index}].villageId`" label="所属房屋"
+                                    label-width="100px" class="font-color-orange flex_item_width4" :rules="[
+                                    { required: true, message: '请选择小区', trigger: 'blur' },
+                                ]">
+                                    <el-select v-model.trim="form.resideInfoDtos[index].villageId" placeholder="请选择小区"
+                                        size="small" class="f-bto0" clearable>
+                                        <el-option v-for="item in item.optionsV" :key="item.value" :label="item.label"
+                                            :value="item.value" @click.native="handleChangeV(index)">
+                                        </el-option>
+                                    </el-select>
+                                </el-form-item>
+
+
+                                <el-form-item :prop="`resideInfoDtos[${index}].buildId`" label-width="0"
+                                    style="margin:0px" :rules="[
+                                    { required: true, message: '请选择楼栋', trigger: 'blur' },
+                                ]" class="flex_item_width3">
+                                    <el-select v-model.trim="form.resideInfoDtos[index].buildId" placeholder="楼号"
+                                        size="small" clearable @change="handleChangeB(index)"
+                                        class=" f-bto0">
+                                        <el-option v-for="item in item.optionsB" :key="item.value" :label="item.label"
+                                            :value="item.value">
+                                        </el-option>
+                                    </el-select>
+                                </el-form-item>
+                                <el-form-item :prop="`resideInfoDtos[${index}].unitId`" label-width="0"
+                                    style="margin:0px" :rules="[
+                                    { required: true, message: '请选择单元', trigger: 'blur' },
+                                ]"  class="flex_item_width3">
+                                    <el-select v-model.trim="form.resideInfoDtos[index].unitId" placeholder="单元"
+                                        size="small" clearable class=" f-bto0"
+                                        @change="handleChangeD(index)">
+                                        <el-option v-for="item in item.optionsD" :key="item.value" :label="item.label"
+                                            :value="item.value">
+                                        </el-option>
+                                    </el-select>
+                                </el-form-item>
+                                <el-form-item :prop="`resideInfoDtos[${index}].homeId`" label-width="0"
+                                    style="margin:0px " :rules="[
+                                    { required: true, message: '请选择房屋', trigger: 'blur' },
+                                ]"  class="flex_item_width3">
+                                    <el-select v-model.trim="form.resideInfoDtos[index].homeId" placeholder="房号"
+                                        size="small" clearable class=" f-bto0"
+                                        @change="handleChangeH(index)">
+                                        <el-option v-for="item in item.optionsH" :key="item.value" :label="item.label"
+                                            :value="item.value">
+                                        </el-option>
+                                    </el-select>
+                                </el-form-item>
+                                <el-button type="primary" size="mini" icon="el-icon-plus" circle
+                                    @click="handelClickAddHouse" style="margin-left: 16px; height: 30px;"></el-button>
+                                <el-button type="danger" v-if="form.resideInfoDtos.length > 1" size="small"
+                                    icon="el-icon-minus" @click="handelClickDelHouse(index)" style="height: 30px;"
+                                    circle>
+                                </el-button>
+                               </div>
+                               <div  class="flex_box">
+
+                                <el-form-item label="人房关系" class="font-color-blue flex_item_width1">
+                                    <el-select v-model.trim="form.resideInfoDtos[index].resiHouseRel" placeholder="请选择"
+                                        size="small" class="list_item_width_1"
+                                        @change="handelChangeResiHouseRel($event, index)" clearable>
+                                        <el-option v-for="(item, i) in dicts.resiHouseRelList" :key="i"
+                                            :label="item.label" :value="item.value"></el-option>
+                                    </el-select>
+                                </el-form-item>
+                                <el-form-item label="人户状况" class="font-color-blue flex_item_width1">
+                                    <el-select v-model.trim="form.resideInfoDtos[index].householdSituation" placeholder="请选择"
+                                        size="small" class="list_item_width_1" clearable>
+                                        <el-option v-for="(item, index) in dicts.householdSituationList" :key="index"
+                                            :label="item.label" :value="item.value"></el-option>
+                                    </el-select>
+                                </el-form-item>
+                                <el-form-item class="flex_item_width1" label="户籍所在地" v-if="form.resideInfoDtos[index].householdSituation == 'rzhbz'">
+                                    <el-input 
+                                        v-model.trim="form.resideInfoDtos[index].placeOfDomicile" placeholder="请输入内容"
+                                        size="small" clearable></el-input>
+                                </el-form-item>
+                                <el-form-item class="flex_item_width1" label="现居住地址" v-else-if="form.resideInfoDtos[index].householdSituation == 'hzrbz'">
+                                    <el-input 
+                                        v-model.trim="form.resideInfoDtos[index].currentResidence" placeholder="请输入内容"
+                                        size="small" clearable></el-input>
+                                </el-form-item>
+                          
+                                <el-form-item class="flex_item_width1" label="迁出时间" v-else-if="form.resideInfoDtos[index].householdSituation == 'rhdbz'">
+                                    <el-date-picker v-model.trim="form.resideInfoDtos[index].outOfTime"
+                                        class="list_item_width_1" type="date" size="small" clearable placeholder="选择日期"
+                                        format="yyyy 年 MM 月 dd 日" value-format="yyyy-MM-dd">
+                                    </el-date-picker>
+                                </el-form-item>
+                                <el-form-item class="flex_item_width1 font-color-blue font-color-blue2" label="与户主关系" >
+                                    <el-select v-model.trim="form.resideInfoDtos[index].houseHolderRel" placeholder="请选择"
+                                        size="small" class="list_item_width_1" clearable>
+                                        <el-option v-for="(item, index) in dicts.houseHolderRelList" :key="index"
+                                            :label="item.label" :value="item.value"></el-option>
+                                    </el-select>
+                                </el-form-item>
+                               </div>
+                                
+                              
+                    </section>
+                <h5>拓展信息登记</h5>
+                <div class="flex_box">
+                 
+                            <el-form-item label="宗教信仰" class="flex_item_width1">
+                                <el-input class="list_item_width_1" v-model.trim="form.religionDto.religion"
+                                    placeholder="请输入内容" size="small" clearable></el-input>
+                            </el-form-item>
+                    
+                            <el-form-item label="就业状态" class="font-color-blue flex_item_width1">
+                                <el-select v-model.trim="form.workInfoDto.careerStatus" placeholder="请选择" size="small"
+                                    class="list_item_width_1" clearable>
+                                    <el-option v-for="(item, index) in dicts.careerStatusList" :key="index"
+                                        :label="item.label" :value="item.value"
+                                        @click.native="handelClickCareerStatus(item.value)"></el-option>
+                                </el-select>
+                            </el-form-item>
+                     
+                            <el-form-item label="工作单位" class="flex_item_width1"   v-if="form.workInfoDto.careerStatus >= 1 && form.workInfoDto.careerStatus <= 5">
+                                <el-input class="list_item_width_1" v-model.trim="form.workInfoDto.workUnit"
+                                    placeholder="请输入内容" size="small" clearable></el-input>
+                            </el-form-item>
+                       
+                            <el-form-item label="职业" class="flex_item_width1" v-if="form.workInfoDto.careerStatus >= 1 && form.workInfoDto.careerStatus <= 5">
+                                <el-input class="list_item_width_1" v-model.trim="form.workInfoDto.occupation"
+                                    placeholder="请输入内容" size="small" clearable></el-input>
+                            </el-form-item>
+                      
+                            <el-form-item label="原工作单位" class="flex_item_width1"  v-if="(form.workInfoDto.careerStatus == 0 || form.workInfoDto.careerStatus == 6) && form.workInfoDto.careerStatus">
+                                <el-input class="list_item_width_1" v-model.trim="form.unemployedDto.originWorkUnit"
+                                    placeholder="请输入内容" size="small" clearable></el-input>
+                            </el-form-item>
+                      
+                            <el-form-item label="失业时间" class="flex_item_width1"  v-if="(form.workInfoDto.careerStatus == 0 || form.workInfoDto.careerStatus == 6) && form.workInfoDto.careerStatus">
+                                <el-date-picker v-model.trim="form.unemployedDto.unemploymentTime"
+                                    class="list_item_width_1" type="date" size="small" clearable placeholder="选择日期"
+                                    format="yyyy 年 MM 月 dd 日" value-format="yyyy-MM-dd">
+                                </el-date-picker>
+                            </el-form-item>
+                  
+                  
+                            <el-form-item label="月收入" class="flex_item_width1" v-if="form.workInfoDto.careerStatus >= 1 && form.workInfoDto.careerStatus <= 5">
+                                <el-input class="list_item_width_1" v-model.trim="form.economyDto.monthIncome"
+                                    placeholder="请输入内容" size="small" clearable></el-input>
+                            </el-form-item>
+                  
+                            <el-form-item label="失业证号" class="flex_item_width1" v-if="(form.workInfoDto.careerStatus == 0 || form.workInfoDto.careerStatus == 6) && form.workInfoDto.careerStatus">
+                                <el-input class="list_item_width_1" v-model.trim="form.unemployedDto.unemploymentNum"
+                                    placeholder="请输入内容" size="small" clearable></el-input>
+                            </el-form-item>
+                      
+                            <el-form-item label="失业原因" class="flex_item_width1" v-if="(form.workInfoDto.careerStatus == 0 || form.workInfoDto.careerStatus == 6) && form.workInfoDto.careerStatus">
+                                <el-select v-model.trim="form.unemployedDto.unemploymentReason" placeholder="请选择"
+                                    size="small" class="list_item_width_1" clearable>
+                                    <el-option v-for="(item, index) in dicts.unemploymentReasonList" :key="index"
+                                        :label="item.label" :value="item.value"></el-option>
+                                </el-select>
+                            </el-form-item>
+                    
+                            <el-form-item label="再就业优惠证号" class="flex_item_width1"  v-if="(form.workInfoDto.careerStatus == 0 || form.workInfoDto.careerStatus == 6) && form.workInfoDto.careerStatus">
+                                <el-input class="list_item_width_1" v-model.trim="form.unemployedDto.employmentNum"
+                                    placeholder="请输入内容" size="small" clearable></el-input>
+                            </el-form-item>
+                      
+                            <el-form-item label="技术特长"class="flex_item_width1"  v-if="(form.workInfoDto.careerStatus == 0 || form.workInfoDto.careerStatus == 6) && form.workInfoDto.careerStatus">
+                                <el-input class="list_item_width_1" v-model.trim="form.unemployedDto.specialSkill"
+                                    placeholder="请输入内容" size="small" clearable></el-input>
+                            </el-form-item>
+                      
+                 
+                            <el-form-item label="是否领取失业金" class="flex_item_width1" v-if="(form.workInfoDto.careerStatus == 0 || form.workInfoDto.careerStatus == 6) && form.workInfoDto.careerStatus">
+                                <el-radio-group v-model.trim="form.unemployedDto.unempCompensationFlag">
+                                    <el-radio :label="item.value" v-for="item in disabilityFlagList" :key="item.value">{{
+                item.label
+            }}</el-radio>
+                                </el-radio-group>
+                            </el-form-item>
+                       
+                            <el-form-item label="是否就业困难对象" class="flex_item_width1" v-if="(form.workInfoDto.careerStatus == 0 || form.workInfoDto.careerStatus == 6) && form.workInfoDto.careerStatus">
+                                <el-radio-group v-model.trim="form.unemployedDto.employmentHardFlag">
+                                    <el-radio :label="item.value" v-for="item in disabilityFlagList" :key="item.value">{{
+                item.label
+            }}</el-radio>
+                                </el-radio-group>
+                            </el-form-item>
+                       
+                            <el-form-item label="劳动就业愿望" class="flex_item_width1"  v-if="(form.workInfoDto.careerStatus == 0 || form.workInfoDto.careerStatus == 6) && form.workInfoDto.careerStatus">
+                                <el-select v-model.trim="form.workInfoDto.employmentWish" placeholder="请选择" size="small"
+                                    class="list_item_width_1" clearable>
+                                    <el-option v-for="(item, index) in dicts.employmentWishList" :key="index"
+                                        :label="item.label" :value="item.value"></el-option>
+                                </el-select>
+                            </el-form-item>
+                 
+                            <el-form-item label="有无赡养人" class="flex_item_width1">
+                                <el-radio-group v-model.trim="form.familyInfoDto.elderlyFlag">
+                                    <el-radio :label="item.value" v-for="item in hasOptions" :key="item.value"
+                                        @click.native="handelClickelderly">{{ item.label
+                                        }}</el-radio>
+                                </el-radio-group>
+                            </el-form-item>
+                       
+                            <el-form-item label="与赡养人关系" class="flex_item_width1" v-if="form.familyInfoDto.elderlyFlag == 1">
+                                <el-select v-model.trim="form.familyInfoDto.elderlyRelation" placeholder="请选择" size="small"
+                                    class="list_item_width_1" clearable>
+                                    <el-option v-for="(item, index) in dicts.houseHolderRelList" :key="index"
+                                        :label="item.label" :value="item.value"></el-option>
+                                </el-select>
+                            </el-form-item>
+                       
+                            <el-form-item label="赡养人联系电话" class="flex_item_width1"v-if="form.familyInfoDto.elderlyFlag == 1">
+                                <el-input class="list_item_width_1" v-model.trim="form.familyInfoDto.dependantMobile"
+                                    placeholder="请输入内容" size="small" clearable></el-input>
+                            </el-form-item>
+                </div>
+                <h5>人员标签</h5>
+                <div class="stafftag">
+                    <stafftag :formType="'add'" @showDialog="showDialog"></stafftag>
+                </div>
+            </el-form>
+            <el-row style="margin:24px">
+                <el-col :span="24" align="center">
+                    <el-button size="small" class="diy-button--white" @click="handlerCancle" plain>取消</el-button>
+                    <el-button type="primary" size="small" :loading="btnLoading"
+                        @click="handleClickSubmit">保存</el-button>
+                    <el-button type="primary" size="small" :loading="btnLoading"
+                        @click="handleClickSubmit('house')">提交并补充家庭人员信息</el-button>
+                </el-col>
+            </el-row>
+        </div>
+        <el-dialog :title="dialogTitle" :visible.sync="dialogVisible" destroy-on-close width="1028px">
+            <resi-expand ref="resiExpand" @submitExpand="submitExpand" @hideExpand="hideExpand"
+                :operationType="'add'"></resi-expand>
+        </el-dialog>
+    </div>
+</template>
+
+<script>
+import { requestGet, requestPost } from "@/js/dai/request";
+import {
+  isCard,
+  isPassport,
+  isMobile,
+  isPhone,
+  isHKPassport,
+  isTwPassport,
+  isSoldier,
+} from "@/utils/validate";
+import { computedCard } from "@/utils/index";
+import {
+  idTypeList,
+  genderList,
+  hasOptions,
+  disabilityFlagList,
+} from "@/js/columns/constants";
+import stafftag from "../modules/portrayal/jumin/cpts/staffTag.vue";
+import resiExpand from "./resiExpand";
+export default {
+  data() {
+    return {
+      dialogVisible: false,
+      dialogTitle: "",
+      formList: [],
+
+            orgOptions: [],
+            orgOptionProps: {
+                value: 'agencyId',
+                label: 'agencyName',
+                children: 'subAgencyList',
+                emitPath: false,
+                multiple: false,
+                checkStrictly: true
+            },
+            form: {
+                baseInfoDto: {
+                    name: null,//姓名
+                    idType: null,//证件类型
+                    idNum: null,//身份证号
+                    nationality: null,//国籍
+                    mobile: null,//手机号
+                    gender: null,//性别
+                    birthday: null,//出生日期
+                    nation: null,//民族
+                    localResidenceFlag: 0,//是否本地户籍
+                    nativePlace: null,//籍贯,
+                    remark: null,//备注
+                    categoryInfo: {
+                        partyFlag: 0,
+                        subsistenceAllowanceFlag: 0,
+                        ensureHouseFlag: 0,
+                        unemployedFlag: 0,
+                        fertileWomanFlag: 0,
+                        veteranFlag: 0,
+                        unitedFrontFlag: 0,
+                        petitionOfficerFlag: 0,
+                        volunteerFlag: 0,
+                        oldPeopleFlag: 0,
+                        emptyNesterFlag: 0,
+                        specialSupportFlag: 0,
+                        disabledFlag: 0,
+                        dementedFlag: 0,
+                        disabilityFlag: 0,
+                        seriousIllnessFlag: 0,
+                        chronicDiseaseFlag: 0,
+                        specialCrowdFlag: 0,
+                        tenantFlag: 0,
+                        floatingFlag: 0,
+                        liveAloneFlag: 0,
+                        publicWelfareFlag: 0,
+                        buildingChiefFlag: 0,
+                        unitChiefFlag: 0,
+                        riskyFlag: 0,
+                        delFlag: 0,
+                    }
+                },
+                eduInfoDto: {
+                    cultureLevel: null,//文化程度
+                },
+                familyInfoDto: {
+                    marriage: null,//婚姻状况
+                    spouseSituation: null,//配偶情况
+                    elderlyFlag: null,//有无赡养人
+                    elderlyRelation: null,//与赡养人关系
+                    dependantMobile: null,//赡养人联系电话	
+                },
+                resideInfoDtos: [
+                    {
+                        agencyName: this.$store.state.user.agencyName,
+                        agencyId: this.$store.state.user.agencyId,
+                        gridId: this.$route.params.gridId,//所属网格id
+                        villageId: this.$route.params.villageId,//小区id
+                        buildId: this.$route.params.buildId,//楼栋id
+                        unitId: this.$route.params.unitId,//单元id
+                        moveOutFlag: null,
+                        outOfTime: null,//迁出时间
+                        homeId: this.$route.params.homeId, //房屋id
+                        placeOfDomicile: null,//户籍所在地	
+                        currentResidence: null,//现居住地
+                        householdSituation: null,//人户状况
+                        houseHolderRel: null,//与户主关系
+                        resiHouseRel: null,//人房关系
+                        optionsV: [],
+                        optionsB: [],
+                        optionsH: [],
+                        optionsD: [],
+                    }
+                ],
+                religionDto: {
+                    religion: null,//宗教信仰
+                },
+                workInfoDto: {
+                    careerStatus: null,//就业状况
+                    workUnit: null,//工作单位
+                    occupation: null,//职业
+                },
+                specialDto: {
+                    specialCategoryCodes: []
+                },
+                unemployedDto: {
+                    originWorkUnit: null,//原工作单位
+                    unemploymentTime: null,//失业时间yyyy-MM-dd	
+                    unemploymentNum: null,//失业证号	
+                    employmentNum: null,//再就业优惠证号	
+                    specialSkill: null,//技术特长	
+                    unempCompensationFlag: null,//是否领取失业补助金
+                    unemploymentReason: null,//失业原因【字典表】code	
+                    employmentHardFlag: null,//是否就业困难对象；1是0不是	
+                    employmentWish: null,//劳动能力就业愿望	 
+                },
+                economyDto: {
+                    monthIncome: null,//月收入
+                }
+            },
+            footerInputList: [
+                {
+                    id: 'healthDto',
+                    children: [
+                        {
+                            label: "残疾类别",
+                            itemType: "select1",
+                            formName: "disabilityCategoryCode",
+                            opctionUrl: 'sys/dict/data/dictlist',
+                            check:'fourFont',
+                            opctionParams: { dictType: 'disability_category_code' },
+                            opction: []
+                        },
+                        {
+                            label: "残疾等级",
+                            check:'fourFont',
+                            itemType: "select1",
+                            formName: "disabilityLevel",
+                            opctionUrl: 'sys/dict/data/dictlist',
+                            opctionParams: { dictType: 'disability_level' },
+                            opction: []
+                        },
+                        {
+                            label: "残疾证号",
+                            check:'fourFont',
+                            itemType: "input1",
+                            formName: "disabilityNum",
+                        },
+                        {
+                            label: "残疾说明",
+                            itemType: "input1",
+                            formName: "disabilityDesc",
+                        },
+                        {
+                            label: "监护人",
+                            itemType: "radio1",
+                            formName: "guardianFlag",
+                            opction: [
+                                { label: '有', formName: '', value: 1 },
+                                { label: '无', formName: '', value: 0 }
+                            ]
+                        },
+                        {
+                            label: "监护人姓名",
+                            itemType: "input1",
+                            formName: "guardianName",
+                        },
+                        {
+                            label: "监护人联系电话",
+                            itemType: "input1",
+                            formName: "guardianMobile",
+                        },
+                        {
+                            label: "技能特长",
+                            itemType: "radio1",
+                            formName: "specialSkillFlag",
+                            opction: [
+                                { label: '有', formName: '', value: 1 },
+                                { label: '无', formName: '', value: 0 }
+                            ]
+                        },
+                        {
+                            label: "劳动能力",
+                            itemType: "radio1",
+                            formName: "workCapacityFlag",
+                            opction: [
+                                { label: '有', formName: '', value: 1 },
+                                { label: '无', formName: '', value: 0 }
+                            ]
+                        },
+                    ]
+                },
+                {
+                    id: 'seriousIllnessDto',
+                    children: [
+                        {
+                            label: "所患大病",
+                            itemType: "checkbox",
+                            formName: "illnessCodes",
+                            check:'fourFont',
+                            opctionUrl: 'sys/dict/data/dictlist',
+                            opctionParams: { dictType: 'illness_code' },
+                            opction: []
+                        },]
+                },
+                {
+                    id: 'chronicDiseaseDto',
+                    children: [
+                        {
+                            label: "所患慢病",
+                            check:'fourFont',
+                            itemType: "checkbox",
+                            formName: "chronicDiseaseCodes",
+                            opctionUrl: 'sys/dict/data/dictlist',
+                            opctionParams: { dictType: 'chronic_disease_code' },
+                            opction: []
+                        },
+                    ]
+                },
+                {
+                    id: 'deathDto',
+                    children: [
+                        {
+                            label: "死亡时间",
+                            itemType: "datepicker1",
+                            formName: "deathTime",
+                            check:'fourFont'
+                        },
+                    ]
+                },
+                {
+                    id: 'oldPeopleDto',
+                    children: [
+                        {
+                            label: "老年人分类",
+                            itemType: "checkbox",
+                            check:'fiveFont',
+                            formName: "oldPeopleCategories",
+                            opctionUrl: 'sys/dict/data/dictlist',
+                            opctionParams: { dictType: 'oldPeople_categories' },
+                            opction:[]
+
+                        },
+                        {
+                            label: "居住情况",
+                            itemType: "select1",
+                            check:'fourFont',
+                            formName: "resideSituation",
+                            opctionUrl: 'sys/dict/data/dictlist',
+                            opctionParams: { dictType: 'reside_situation' },
+                        },
+                        {
+                            label: "高龄补助",
+                            check:'fourFont',
+                            itemType: "inputNum",
+                            formName: "oldSubsidy",
+                        },
+                    ]
+                },
+                {
+                    id: 'subsistenceAllowanceDto',
+                    children: [
+                        {
+                            label: "低保类别",
+                            itemType: "select1",
+                            check:'fourFont',
+                            formName: "category",
+                            opctionUrl: 'sys/dict/data/dictlist',
+                            opctionParams: { dictType: 'subsistence_allowance_category' },
+                        },
+                        {
+                            label: "低保享受原因",
+                            itemType: "checkbox",
+                            check:'sixFont',
+                            formName: "reasons",
+                            opctionUrl: 'sys/dict/data/dictlist',
+                            opctionParams: { dictType: 'subsistence_allowance_reasons' },
+                            opction: []
+                        },
+
+                    ]
+                },
+                {
+                    id: "parymemberInfoDto",
+                    children: [
+                        {
+                            label: "入党时间",
+                            itemType: "datepicker1",
+                            formName: "joinTime",
+                            check:'fourFont',
+                            opction: [
+                            ]
+                        },
+                        {
+                            label: "转正时间",
+                            itemType: "datepicker1",
+                            formName: "positiveTime",
+                            opction: [
+                            ]
+                        },
+                        {
+                            label: "所属党组织",
+                            itemType: "cascader1",
+                            check:'fiveFont',
+                            formName: "partyOrgId",
+                            opction: [
+                            ]
+                        },
+                        {
+                            label: "流动党员",
+                            itemType: "radio1",
+                            formName: "flowFlag",
+                            opction: [
+                                { label: '是', value: 1 },
+                                { label: '否', value: 0 },
+                            ]
+                        },
+                        {
+                            label: "流动党员活动证号",
+                            itemType: "input1",
+                            formName: "flowActNum",
+                        },
+                        {
+                            label: "党组织职务",
+                            itemType: "select1",
+                            check:'fiveFont',
+                            formName: "partyJob",
+                            opctionUrl: 'sys/dict/data/dictlist',
+                            opctionParams: { dictType: 'party_job' },
+                            opction: [
+                            ]
+                        },
+                        {
+                            label: "工作职责",
+                            itemType: "input1",
+                            formName: "duty",
+                        },
+                        {
+                            label: "是否退休",
+                            itemType: "radio1",
+                            formName: "retiredFlag",
+                            opction: [
+                                { label: '是', value: 1 },
+                                { label: '否', value: 0 },
+                            ]
+                        }, {
+                            label: "党员中心户",
+                            itemType: "radio1",
+                            formName: "centerFlag",
+                            check:'fiveFont',
+                            opction: [
+                                { label: '是', value: 1 },
+                                { label: '否', value: 0 },
+                            ]
+                        }, {
+                            label: "免学习",
+                            itemType: "radio1",
+                            formName: "studyNotNeed",
+                            opction: [
+                                { label: '是', value: 1 },
+                                { label: '否', value: 0 },
+                            ]
+                        }, {
+                            label: "入党时所在党支部",
+                            itemType: "input1",
+                            formName: "joinBranchName",
+                        }, {
+                            label: "组织关系转入社区时间",
+                            itemType: "datepicker1",
+                            formName: "joinCommunityTime",
+                            opction: [
+                            ]
+                        },
+                    ]
+                },
+                {
+                    id: 'ensureHouseDto',
+                    children: [
+                        {
+                            label: "所在社区",
+                            check:'fourFont',
+                            itemType: "input1",
+                            formName: "liveCommunity",
+                        },
+                        {
+                            label: "住房性质",
+                            check:'fourFont',
+                            itemType: "select1",
+                            formName: "housingNature",
+                            opctionUrl: 'sys/dict/data/house',
+                            opctionParams: { formCode: "resi_base_info" },
+                            opction: [
+                            ]
+                        }
+                    ]
+                },
+                {
+                    id: 'veteranDto',
+                    children: [
+                        {
+                            label: "入伍日期",
+                            itemType: "datepicker1",
+                            formName: "joinArmyTime",
+                            check:'fourFont',
+                            opction: [
+                            ]
+                        },
+                        {
+                            label: "退伍日期",
+                            check:'fourFont',
+                            itemType: "datepicker1",
+                            formName: "leaveArmyTime",
+                            opction: [
+                            ]
+                        },
+                        {
+                            label: "服役单位",
+                            itemType: "input1",
+                            formName: "serviceUnit",
+                        },
+                        {
+                            label: "接收单位",
+                            itemType: "input1",
+                            formName: "receiveUnit",
+                        },
+                        {
+                            label: "待安置补助金",
+                            itemType: "inputNum",
+                            formName: "settlementAmount",
+                            opction: [
+
+                            ]
+                        },
+                        {
+                            label: "培训状况",
+                            itemType: "input1",
+                            formName: "trainDesc",
+                        },
+                        {
+                            label: "现就业情况",
+                            itemType: "input1",
+                            formName: "employmentSituation",
+                        },
+                        {
+                            label: "是否办理公益性岗位",
+                            itemType: "radio1",
+                            check:'nineFont',
+                            formName: "pubWelfareJobFlag",
+                            opction: [
+                                { label: '是', value: 1 },
+                                { label: '否', value: 0 },
+                            ]
+                        }
+                    ]
+                },
+                {
+                    id: 'unitedFrontDto',
+                    children: [{
+                        label: "统战类型",
+                        check:'fourFont',
+                        itemType: "input1",
+                        formName: "unitedFrontType",
+                    }]
+                },
+                {
+                    id: 'volunteerDto',
+                    children: [
+                        {
+                            label: "志愿者类别",
+                            itemType: "checkbox",
+                            formName: "volunteerCategory",
+                            opctionUrl: 'sys/dict/data/dictlist',
+                            opctionParams: { dictType: "VOLUNTEER_CATEGORY" },
+                            opction: [
+                            ]
+                        }
+                    ]
+                },
+                {
+                    id: 'specialSupportDto',
+                    children: [
+
+                        {//0
+                            label: "特扶类别",
+                            check:'fourFont',
+                            itemType: "select1",
+                            formName: "specialSupportType",
+                            opction: [
+                                {
+                                    value: '1',
+                                    label: '失独'
+                                },
+                                {
+                                    value: '2',
+                                    label: '伤残'
+                                }
+                            ]
+                        },
+                        {//1
+                            label: "子女姓名",
+                            check:'fourFont',
+                            itemType: "input1",
+                            formName: "childName",
+                            opction: [
+                            ]
+                        },
+                        {//2
+                            label: "子女性别",
+                            check:'fourFont',
+                            itemType: "select1",
+                            formName: "childGender",
+                            opction: [
+                                {
+                                    value: '1',
+                                    label: '男'
+                                },
+                                {
+                                    value: '2',
+                                    label: '女'
+                                }
+                            ]
+                        },
+                        {
+                            label: "子女死亡日期",
+                            check:'sixFont',
+                            itemType: "datepicker1",
+                            formName: "certificateDate",
+                            opction: [],
+                        },
+                        {
+                            label: "子女伤残类别",
+                            check:'sixFont',
+                            itemType: "select1",
+                            formName: "childDisabilityCategoryCode",
+                            opctionUrl: 'sys/dict/data/dictlist',
+                            opctionParams: { dictType: 'disability_category_code' },
+                            opction: []
+                        },
+                        {
+                            label: "子女伤残等级",
+                            check:'sixFont',
+                            itemType: "select1",
+                            formName: "childDisabilityLevel",
+                            opctionUrl: 'sys/dict/data/dictlist',
+                            opctionParams: { dictType: 'disability_level' },
+                            opction: []
+                        }
+
+                    ]
+                },
+            ],
+
+      idTypeList,
+      genderList,
+      hasOptions,
+      disabilityFlagList,
+      btnLoading: false,
+      rules: {
+        "baseInfoDto.name": [
+          { required: true, message: "请输入姓名", trigger: "blur" },
+        ],
+        "baseInfoDto.idType": [
+          { required: true, message: "请选择证件类型", trigger: "blur" },
+        ],
+        "baseInfoDto.idNum": [
+          { required: true, message: "请输入证件号码", trigger: "blur" },
+        ],
+        "baseInfoDto.mobile": [
+          { required: true, message: "请输入电话", trigger: "blur" },
+        ],
+        "baseInfoDto.nationality": [
+          { required: true, message: "请选择国籍", trigger: "blur" },
+        ],
+      },
+      dicts: {
+        educationList: [], //文化程度
+        nationList: [], //民族
+        nationalityList: [], //国籍
+        marriageList: [], //婚姻状况
+        householdSituationList: [], //人户状况
+        houseHolderRelList: [], //与户主关系
+        careerStatusList: [], //就业状况
+        spouseSituationList: [], //配偶情况
+        unemploymentReasonList: [], //失业原因
+        employmentWishList: [], //就业意愿
+        resiHouseRelList: [
+          {
+            label: "自住",
+            value: 0,
+          },
+          {
+            label: "租住",
+            value: 1,
+          },
+        ],
+      },
+      logLevelChecked: 0,
+    };
+  },
+  created() {
+    this.getDicts();
+    this.getOrgTreeList();
+
+    this.initHouseBind();
+  },
+  methods: {
+    // 从房屋画像进行添加居民时绑定房屋信息
+    initHouseBind() {
+      for (let i in this.form.resideInfoDtos) {
+        this.getValiheList(i);
+        this.getBuildList(i);
+        this.getHouseList(i);
+        this.getUniList(i);
+        this.form.resideInfoDtos[i].orgOptions = [];
+        this.getOrgTreeList(this.form.resideInfoDtos[i].agencyId, i);
+      }
+    },
+    async getDicts() {
+      try {
+        const requests = [
+          this.$http.post("sys/dict/data/dictlist", {
+            dictType: "nationality",
+          }),
+          this.$http.post("sys/dict/data/nation", {
+            formCode: "resi_base_info",
+          }),
+          this.$http.post("sys/dict/data/education", {
+            formCode: "resi_base_info",
+          }),
+          this.$http.post("sys/dict/data/dictlist", {
+            dictType: "marriage",
+          }),
+          this.$http.post("sys/dict/data/dictlist", {
+            dictType: "household_situation",
+          }),
+          this.$http.post("sys/dict/data/relationship", {
+            formCode: "resi_base_info",
+          }),
+          this.$http.post("sys/dict/data/dictlist", {
+            dictType: "career_status",
+          }),
+          this.$http.post("sys/dict/data/dictlist", {
+            dictType: "spouse_situation",
+          }),
+          this.$http.post("sys/dict/data/dictlist", {
+            dictType: "unemployment_reason",
+          }),
+          this.$http.post("sys/dict/data/dictlist", {
+            dictType: "career_goals",
+          }),
+        ];
+        const dictKeys = [
+          "nationalityList",
+          "nationList",
+          "educationList",
+          "marriageList",
+          "householdSituationList",
+          "houseHolderRelList",
+          "careerStatusList",
+          "spouseSituationList",
+          "unemploymentReasonList",
+          "employmentWishList",
+        ]; // 对应的键名
+
+        const results = await Promise.all(requests);
+        results.forEach((result, index) => {
+          if (result.data.code === 0) {
+            this.dicts[dictKeys[index]].push(...result.data.data);
+          } else {
+            console.log(`获取${dictKeys[index]}失败: ${result.data.msg}`);
+          }
+        });
+      } catch (error) {
+        console.log("获取字典失败: ", error);
+      }
+    },
+    getOrgTreeList() {
+      this.$http
+        .post("/gov/org/customeragency/agencygridtree", {})
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg);
+          } else {
+            console.log("获取组织树成功", res.data);
+            this.orgOptions = [];
+            this.orgOptions.push(res.data);
+          }
+        })
+        .catch(() => {
+          return this.$message.error("网络错误");
+        });
+    },
+    handelChangeResiHouseRel(val, index) {
+      this.form.resideInfoDtos[index].householdSituation =
+        val == 0 ? "rhyz" : "rzhbz";
+    },
+    handleChangeV(index) {
+      console.log(this.form.resideInfoDtos[index].villageId);
+      this.form.resideInfoDtos[index].buildId = "";
+      this.form.resideInfoDtos[index].unitId = "";
+      this.form.resideInfoDtos[index].homeId = "";
+      this.getBuildList(index);
+      this.getUniList(index);
+      this.getHouseList(index);
+    },
+    handleChangeB(index) {
+      this.form.resideInfoDtos[index].unitId = "";
+      this.form.resideInfoDtos[index].homeId = "";
+      this.getUniList(index);
+      this.getHouseList(index);
+    },
+    handleChangeD(index) {
+      this.form.resideInfoDtos[index].homeId = "";
+      this.getHouseList(index);
+    },
+    handleChangeH(i) {
+      // let item = this.optionsH.find((item, index) => index === i);
+      // if (item && item.type == '1') {
+      //     // this.form.IS_TENANT = '1'
+      //     console.log('item-----', item)
+      // }
+      // else
+      //  this.form.IS_TENANT = '0'
+    },
+    handleChangeAgency(index) {
+      let obj = this.$refs[`myCascader`][index].getCheckedNodes()[0]
+        ? this.$refs["myCascader"][index].getCheckedNodes()[0].data
+        : null;
+      if (obj) {
+        if (obj.level === "grid") {
+          this.form.resideInfoDtos[index].gridId = obj.agencyId;
+          this.form.resideInfoDtos[index].agencyId = obj.pid;
+
+          this.form.resideInfoDtos[index].villageId = "";
+          this.form.resideInfoDtos[index].buildId = "";
+          this.form.resideInfoDtos[index].unitId = "";
+          this.form.resideInfoDtos[index].homeId = "";
+
+                    this.getValiheList(index);
+                } else {
+                    // this.selGridId = []
+                    this.form.resideInfoDtos[index].gridId = ''
+                    this.form.resideInfoDtos[index].agencyId = ''
+                    this.$message.info('请选择网格')
+                    return false
+                }
+
+            }
+
+        },
+        getValiheList(index) {
+            console.log(this.form.resideInfoDtos[index].gridId, '小区接口');
+            console.log(this.form.resideInfoDtos);
+            const { user } = this.$store.state
+            this.$http.post('/actual/base/communityQuarters/listQuartersOptions', { gridId: this.form.resideInfoDtos[index].gridId, agencyId: user.agencyId }).then(({ data: res }) => {
+                if (res.code !== 0) {
+                    return this.$message.error(res.msg)
+                } else {
+                    this.form.resideInfoDtos[index].optionsV = []
+                    this.form.resideInfoDtos[index].optionsV.push(...res.data)
+                }
+            }).catch((err) => {
+                console.log(err);
+                return this.$message.error('网络错误')
+            })
+        },
+        getBuildList(index) {
+            this.$http.post('/actual/base/communityBuilding/buildingoption', { quartersId: this.form.resideInfoDtos[index].villageId }).then(({ data: res }) => {
+                if (res.code !== 0) {
+                    return this.$message.error(res.msg)
+                } else {
+                    this.form.resideInfoDtos[index].optionsB = res.data
+                }
+            }).catch(() => {
+                return this.$message.error('网络错误')
+            })
+        },
+        getUniList(index) {
+            this.$http.post('/actual/base/communityBuildingUnit/unitoption', { buildingId: this.form.resideInfoDtos[index].buildId }).then(({ data: res }) => {
+                if (res.code !== 0) {
+                    return this.$message.error(res.msg)
+                } else {
+                    this.form.resideInfoDtos[index].optionsD = res.data
+                }
+            }).catch(() => {
+                return this.$message.error('网络错误')
+            })
+        },
+        getHouseList(index) {
+            this.$http.post('/actual/base/communityHouse/houseoption', { unitId: this.form.resideInfoDtos[index].unitId }).then(({ data: res }) => {
+                if (res.code !== 0) {
+                    return this.$message.error(res.msg)
+                } else {
+                    this.form.resideInfoDtos[index].optionsH = res.data
+                }
+            }).catch(() => {
+                return this.$message.error('网络错误')
+            })
+        },
+        handelClickAddHouse() {
+            this.form.resideInfoDtos.push(
+                {
+                    agencyName: this.$store.state.user.agencyName,
+                    agencyId: this.$store.state.user.agencyId,
+                    gridId: null,//所属网格id
+                    villageId: null,//小区id
+                    buildId: null,//楼栋id
+                    unitId: null,//单元id
+                    moveOutFlag: null,
+                    outOfTime: null,//迁出时间
+                    homeId: null, //房屋id
+                    placeOfDomicile: null,//户籍所在地	
+                    currentResidence: null,//现居住地
+                    householdSituation: null,//人户状况
+                    houseHolderRel: null,//与户主关系
+                    resiHouseRel: null,//人房关系
+                    optionsV: [],
+                    optionsB: [],
+                    optionsH: [],
+                    optionsD: [],
+                }
+            )
+        },
+        handelClickDelHouse(i) {
+            this.form.resideInfoDtos = this.form.resideInfoDtos.filter((item, index) => index != i)
+        },
+        handelCLickIdType(val){
+          if(val === 1){
+            this.getResidentInfoByIdNum()
+          }
+        },
+        handleValidBlur() {
+            if (this.form.baseInfoDto.idType == 1) {
+              this.getResidentInfoByIdNum()
+            }
+            if (!isCard(this.form.baseInfoDto.idNum) && !isPassport(this.form.baseInfoDto.idNum)) return
+            const { user } = this.$store.state
+            let huji = '', i = 0
+            if (user.areaCodePath && user.areaCodePath.length > 0) {
+                i = user.areaCodePath.length - 1
+                huji = user.areaCodePath[i].length > 6 ? user.areaCodePath[i].substr(0, 6) : user.areaCodePath[i]
+            }
+
+            if (this.form.baseInfoDto.idNum.length === 18 || this.form.baseInfoDto.idNum.length === 15) {
+                const _id = this.form.baseInfoDto.idNum.substr(0, 6)
+                const { sex, birth, age } = computedCard(this.form.baseInfoDto.idNum)
+                this.form.baseInfoDto.birthday = birth
+                this.form.baseInfoDto.gender = sex == 1 ? '1' : '2'
+                this.form.baseInfoDto.categoryInfo.oldPeopleFlag = age >= 60 ? 1 : 0
+                // this.form.IS_BDHJ = huji == _id ? '1' : ''
+                // 身份证前端验证角色方法 因原型没有注释
+                // this.validateIdcard(this.form.idNum)
+
+            }
+
+        },
+        async getResidentInfoByIdNum(){
+            try {
+                let url = '/actual/base/residentBaseInfo/getResidentInfoByIdNum'
+                let parm = {
+                    idType: this.form.baseInfoDto.idType,
+                    idNum: this.form.baseInfoDto.idNum
+                }
+                let { code, data, msg } = await requestGet(url,parm)
+                if (code == 0 && data != null) {
+                    this.$confirm(`该居民已存在于“${data.homeNames.join(',')}”是否继续填写`, {
+                    confirmButtonText: '前往修改',
+                    cancelButtonText: '继续填写',
+                    type: 'warning'
+                }).then(() => {
+                    this.$router.push({ name: 'edit-resi', query: { id: data.id }, params: { idNum: data.idNum, mobile: data.mobile } });
+
+                }).catch(() => {
+                    
+                });
+
+                } else if (code >= 8000) {
+                    this.$message.error(msg);
+                    this.btnLoading = false;
+                }
+            }
+            catch (error) {
+                // this.$message.error(msg);
+                console.log(msg);
+            }
+        },
+        handleLocalRadio(e) {
+            if (e.target.type === 'radio') return
+            this.form.baseInfoDto.localResidenceFlag = this.form.baseInfoDto.localResidenceFlag === 0 ? 1 : 0;
+            console.log(this.form.baseInfoDto.localResidenceFlag);
+        },
+        handelClickMarriage() {
+            this.form.familyInfoDto.spouseSituation = null
+        },
+        handelClickelderly() {
+            this.form.familyInfoDto.elderlyRelation = null
+            this.form.familyInfoDto.dependantMobile = null
+        },
+        handelClickCareerStatus(val) {
+            this.form.unemployedDto = {
+                originWorkUnit: null,//原工作单位
+                unemploymentTime: null,//失业时间yyyy-MM-dd	
+                unemploymentNum: null,//失业证号	
+                employmentNum: null,//再就业优惠证号	
+                specialSkill: null,//技术特长	
+                unempCompensationFlag: null,//是否领取失业补助金
+                unemploymentReason: null,//失业原因【字典表】code	
+                employmentHardFlag: null,//是否就业困难对象；1是0不是	
+                employmentWish: null,//劳动能力就业愿望
+
+            }
+            this.form.workInfoDto = {
+                careerStatus: val,//就业状况
+                workUnit: null,//工作单位
+                occupation: null,//职业
+            }
+            if (val == 0) {
+                this.form.baseInfoDto.categoryInfo.unemployedFlag = 1
+            }else{
+                this.form.baseInfoDto.categoryInfo.unemployedFlag = 0
+            }
+        },
+        handlerCancle() {
+            this.$store.state.contentTabs = this.$store.state.contentTabs.filter(
+                (item) => item.name !== 'add-resi'
+            );
+            let tab =
+                this.$store.state.contentTabs[
+                this.$store.state.contentTabs.length - 1
+                ];
+            this.$router.push({
+                name: tab.name,
+                params: { ...tab.params },
+                query: { ...tab.query },
+            });
+        },
+        handleClickSubmit(house) {
+            this.$refs['addForm'].validate((valid) => {
+                if (valid) {
+                    this.form.resideInfoDtos.forEach(item => {
+                        delete item.optionsV;
+                        delete item.optionsB;
+                        delete item.optionsH;
+                        delete item.optionsD;
+                    });
+                    this.submitForm(house);
+                }
+            })
+        },
+        async submitForm(house) {
+            this.btnLoading = true;
+            try {
+                let url = '/actual/base/residentBaseInfo/save'
+                let parm = {
+                    ...this.form
+                }
+                let { code, data, msg } = await requestPost(url, parm)
+                if (code == 0) {
+                    if (house != 'house') {
+                        this.$message.success('保存成功');
+                        this.$refs['addForm'].resetFields();
+                        this.handlerCancle();
+                    } else {
+                        this.$message.success('保存成功');
+                        let homeArr = JSON.parse(JSON.stringify(this.form.resideInfoDtos));
+                        this.$refs['addForm'].resetFields();
+                        this.form.resideInfoDtos = homeArr
+                    }
+                    this.btnLoading = false;
+
+                } else if (code >= 8000) {
+                    this.$message.error(msg);
+                    this.btnLoading = false;
+                }
+            }
+            catch (error) {
+                this.$message.error(msg);
+            }
+        },
+        showDialog({ index, value }, event) {
+            if (value == 1) {
+                value = 'parymemberInfoDto'
+                this.form.baseInfoDto.categoryInfo.partyFlag = 1;
+            } else if (value == 0) {
+                this.form.baseInfoDto.categoryInfo.partyFlag = 0;
+            } else if (value == 2) {
+                this.form.baseInfoDto.categoryInfo.partyFlag = 2;
+            }
+            if (index != 3 && index) {
+                this.form.baseInfoDto.categoryInfo[value] = event ? 1 : 0;
+            } else if (index == 3) {
+                if (event) {
+                    this.form.baseInfoDto.categoryInfo.specialCrowdFlag = 1;
+                    if (value == 'unitedFrontFlag' || value == 'petitionOfficerFlag') {
+                        this.form.baseInfoDto.categoryInfo[value] = 1
+                    }
+                    this.form.specialDto.specialCategoryCodes.push(value);
+                } else {
+                    this.form.specialDto.specialCategoryCodes = this.form.specialDto.specialCategoryCodes.filter(item => item != value);
+                    if (value == 'unitedFrontFlag' || value == 'petitionOfficerFlag') {
+                        this.form.baseInfoDto.categoryInfo[value] = 0
+                    }
+                }
+            }
+            const map = {
+                'parymemberInfoDto': { formId: 'parymemberInfoDto', formType: 'parymemberInfoDto', title: '党员信息' },
+                'disabilityFlag': { formId: 'healthDto', formType: 'healthDto', title: '残疾信息' },
+                'seriousIllnessFlag': { formId: 'seriousIllnessDto', formType: 'seriousIllnessDto', title: '大病信息' },
+                'chronicDiseaseFlag': { formId: 'chronicDiseaseDto', formType: 'chronicDiseaseDto', title: '慢病信息' },
+                'deathFlag': { formId: 'deathDto', formType: 'deathDto', title: '死亡' },
+                'oldPeopleFlag': { formId: 'oldPeopleDto', formType: 'oldPeopleDto', title: '老年人信息' },
+                'subsistenceAllowanceFlag': { formId: 'subsistenceAllowanceDto', formType: 'subsistenceAllowanceDto', title: '低保人员信息' },
+                'veteranFlag': { formId: 'veteranDto', formType: 'veteranDto', title: '退役军人信息' },
+                'ensureHouseFlag': { formId: 'ensureHouseDto', formType: 'ensureHouseDto', title: '保障性住房信息' },
+                'specialSupportFlag': { formId: 'specialSupportDto', formType: 'specialSupportDto', title: '特扶人员' },
+                'unitedFrontFlag': { formId: 'unitedFrontDto', formType: 'unitedFrontDto', title: '统战人员' },
+                'volunteerFlag': { formId: 'volunteerDto', formType: 'volunteerDto', title: '志愿者' },
+            };
+
+      if (map[value]) {
+        this.dialogTitle = map[value].title;
+        this.dialogVisible =
+          (event == true || value == "parymemberInfoDto") &&
+          this.dialogTitle != "";
+        this.$nextTick(() => {
+          this.$refs["resiExpand"].formList = [
+            this.footerInputList.find((item) => item.id === map[value].formId),
+          ];
+          this.$refs["resiExpand"].formType = map[value].formType;
+          this.$refs["resiExpand"].showForm();
+        });
+      }
+    },
+    // 提交扩展信息
+    submitExpand(form, formType) {
+      this.form[formType] = form[formType];
+      this.dialogVisible = false;
+    },
+    hideExpand(formType) {
+      delete this.form[formType];
+      this.dialogVisible = false;
+    },
+  },
+  components: { stafftag, resiExpand },
+  computed: {},
+  watch: {},
+};
+</script>
+
+<style lang='scss' scoped>
+@import "@/assets/scss/modules/management/form-main.scss";
+@import "@/assets/scss/pages/resiAdd.scss";
+</style>
diff --git a/src/views/components/checkBox.vue b/src/views/components/checkBox.vue
index 41bc5cfae..3306b7a0e 100644
--- a/src/views/components/checkBox.vue
+++ b/src/views/components/checkBox.vue
@@ -2,10 +2,10 @@
   <div v-loading="loading">
     <el-checkbox
       :indeterminate="isIndeterminate" 
-      v-model="checkAll" 
+      v-model.trim="checkAll" 
       @change="handleCheckAllChange">全选</el-checkbox>
     <div style="margin: 15px 0;"></div>
-    <el-checkbox-group v-if="boxList.length > 0" v-model="checkedList" @change="handleChange">
+    <el-checkbox-group v-if="boxList.length > 0" v-model.trim="checkedList" @change="handleChange">
       <div v-for="n in boxList" :key="n.itemId" class="mb10">
         <el-checkbox :label="n.itemId">{{n.label}}</el-checkbox>
       </div>
diff --git a/src/views/components/editResi.vue b/src/views/components/editResi.vue
index 791665279..41430c83f 100644
--- a/src/views/components/editResi.vue
+++ b/src/views/components/editResi.vue
@@ -1,950 +1,2280 @@
 <template>
-  <div :id="formId"
-       class="resi-container">
-    <el-form :ref="formId"
-             class="resi-form"
-             :model="form"
-             :rules="rulesForm"
-             :label-width="labelWidth">
-      <template v-if="supportAdd">
-        <el-row style="margin-bottom: 10px;">
-          <el-col :span="24">
-            <el-button icon="el-icon-plus"
-                       size="small"
-                       @click="handleAddRow"></el-button>
-          </el-col>
-        </el-row>
-        <edit-form v-for="(item, index) in addList"
-                   :key="index"
-                   :ref="'baseForms' + index"
-                   :columns="3"
-                   :form-list="item.itemList || formList"
-                   :form-id="'baseForms' + item.row" />
-      </template>
-      <template v-else>
-        <el-row v-if="fixed"
-                class="resi-row">
-          <!-- <el-col v-for="n in item" :key="n.id" :span="n.itemType === 'textarea'&&24 || (24/columns)"> -->
-          <el-col :span="6">
-            <el-form-item prop="GRID_ID"
-                          label="所属网格">
-              <!-- <div class="resi-cell"> -->
-              <!-- <div class="resi-cell-label">{{n.label}}</div> -->
-              <div class="resi-cell-value">
-                <el-select v-model.trim="form.GRID_ID"
-                           :disabled="disabled"
-                           placeholder="请选择网格"
-                           size="small"
-                           clearable
-                           class="resi-cell-select"
-                           @change="handleChangeGrid">
-                  <el-option v-for="item in optionsG"
-                             :key="item.value"
-                             :label="item.label"
-                             :value="item.value">
-                  </el-option>
+  <div class="div_form" v-loading="loading">
+    <div class="form">
+      <el-form :model="form" :rules="rules" label-width="105px" ref="editForm">
+        <h5 style="margin-top: 6px">基础信息登记</h5>
+        <div class="flex_box">
+              <el-form-item
+                label="姓名"
+                prop="baseInfoDto.name"
+                class="font-color-orange flex_item_width1"
+              >
+                <el-input
+                  class="list_item_width_1"
+                  v-model.trim="form.baseInfoDto.name"
+                  placeholder="请输入内容"
+                  size="small"
+                  clearable
+                ></el-input>
+              </el-form-item>
+            
+              <el-form-item
+                label="证件类型"
+                prop="baseInfoDto.idType"
+                class="font-color-orange flex_item_width1"
+              >
+                <el-select
+                  v-model.trim="form.baseInfoDto.idType"
+                  placeholder="请选择"
+                  size="small"
+                  class="list_item_width_1"
+                  clearable
+                >
+                  <el-option
+                    v-for="(item, index) in idTypeList"
+                    :key="index"
+                    :label="item.label"
+                    :value="item.value"
+                  ></el-option>
                 </el-select>
-              </div>
-              <!-- </div> -->
-            </el-form-item>
-          </el-col>
-          <el-col :span="18">
-            <el-form-item label="所属房屋"
-                          required>
-              <div class="resi-cell-value">
-                <div class="resi-cell-col">
-                  <el-form-item prop="VILLAGE_ID">
-                    <el-select v-model.trim="form.VILLAGE_ID"
-                               placeholder="请选择小区"
-                               size="small"
-                               clearable
-                               class="resi-cell-select"
-                               :disabled="disabled"
-                               @change="handleChangeV">
-                      <el-option v-for="item in optionsV"
-                                 :key="item.value"
-                                 :label="item.label"
-                                 :value="item.value">
-                      </el-option>
-                    </el-select>
-                  </el-form-item>
-                  <el-form-item prop="BUILD_ID">
-                    <el-select v-model.trim="form.BUILD_ID"
-                               placeholder="请选择楼号"
-                               size="small"
-                               clearable
-                               :disabled="disabled"
-                               class="resi-cell-select resi-cell-select-middle"
-                               @change="handleChangeB">
-                      <el-option v-for="item in optionsB"
-                                 :key="item.value"
-                                 :label="item.label"
-                                 :value="item.value">
-                      </el-option>
-                    </el-select>
-                  </el-form-item>
-                  <el-form-item prop="UNIT_ID">
-                    <el-select v-model.trim="form.UNIT_ID"
-                               placeholder="请选择单元"
-                               size="small"
-                               clearable
-                               :disabled="disabled"
-                               class="resi-cell-select resi-cell-select-middle"
-                               @change="handleChangeD">
-                      <el-option v-for="item in optionsD"
-                                 :key="item.value"
-                                 :label="item.label"
-                                 :value="item.value">
-                      </el-option>
-                    </el-select>
-                  </el-form-item>
-                  <el-form-item prop="HOME_ID">
-                    <el-select v-model.trim="form.HOME_ID"
-                               placeholder="请选择房号"
-                               size="small"
-                               clearable
-                               :disabled="disabled"
-                               class="resi-cell-select resi-cell-select-middle"
-                               @change="handleChangeH">
-                      <el-option v-for="item in optionsH"
-                                 :key="item.value"
-                                 :label="item.label"
-                                 :value="item.value">
-                      </el-option>
-                    </el-select>
-                  </el-form-item>
-                </div>
-                <!-- <el-col :span="6">
-
-                  </el-col>
-                  <el-col :span="6">
-
-                  </el-col>
-                  <el-col :span="6">
-
-                  </el-col>
-                  <el-col :span="6">
-
-                  </el-col> -->
-              </div>
-            </el-form-item>
-          </el-col>
-          <!-- <el-col :span="6">
-              <el-form-item :prop="form.BUILD_ID" label="所属楼宇">
-                <div class="resi-cell-value">
-                  <el-select v-model.trim="form.BUILD_ID" :disabled="disabled" placeholder="请选择楼号" size="small"
-                  clearable class="resi-cell-select"
+              </el-form-item>
+           
+              <el-form-item
+                label="证件号"
+                prop="baseInfoDto.idNum"
+                class="flex_item_width1"
+              >
+                <el-input
+                  v-model.trim="form.baseInfoDto.idNum"
+                  placeholder="请输入内容"
+                  clearable
+                  size="small"
+                  class="list_item_width_1"
+                  @blur="handleValidBlur"
+                ></el-input>
+              </el-form-item>
+          
+              <el-form-item
+                label="国籍"
+                prop="baseInfoDto.nationality"
+                class="font-color-orange flex_item_width1"
+              >
+                <el-select
+                  v-model.trim="form.baseInfoDto.nationality"
+                  placeholder="请选择"
+                  size="small"
+                  class="list_item_width_1"
+                  clearable
+                >
+                  <el-option
+                    v-for="(item, index) in dicts.nationalityList"
+                    :key="index"
+                    :label="item.label"
+                    :value="item.value"
+                  ></el-option>
+                </el-select>
+              </el-form-item>
+            
+              <el-form-item
+                label="联系电话"
+                prop="baseInfoDto.mobile"
+                class="font-color-orange flex_item_width1"
+              >
+                <el-input
+                  class="list_item_width_1"
+                  v-model.trim="form.baseInfoDto.mobile"
+                  placeholder="请输入内容"
+                  size="small"
+                  clearable
+                ></el-input>
+              </el-form-item>
+           
+              <el-form-item label="性别" prop="baseInfoDto.gender" class="flex_item_width1">
+                <el-select
+                  v-model.trim="form.baseInfoDto.gender"
+                  placeholder="请选择"
+                  size="small"
+                  class="list_item_width_1"
+                  clearable
+                >
+                  <el-option
+                    v-for="(item, index) in genderList"
+                    :key="index"
+                    :label="item.label"
+                    :value="item.value"
+                  ></el-option>
+                </el-select>
+              </el-form-item>
+          
+              <el-form-item label="出生日期" class="flex_item_width1" prop="baseInfoDto.birthday">
+                <el-date-picker
+                  v-model.trim="form.baseInfoDto.birthday"
+                  class="list_item_width_1"
+                  type="date"
+                  size="small"
+                  clearable
+                  placeholder="选择日期"
+                  format="yyyy 年 MM 月 dd 日"
+                  value-format="yyyy-MM-dd"
+                >
+                </el-date-picker>
+           </el-form-item>
+              <el-form-item label="民族" class="flex_item_width1" prop="baseInfoDto.nation">
+                <el-select
+                  v-model.trim="form.baseInfoDto.nation"
+                  placeholder="请选择"
+                  size="small"
+                  class="list_item_width_1"
+                  clearable
+                >
+                  <el-option
+                    v-for="(item, index) in dicts.nationList"
+                    :key="index"
+                    :label="item.label"
+                    :value="item.value"
+                  ></el-option>
+                </el-select>
+              </el-form-item>
+           
+              <el-form-item label="文化程度" class="flex_item_width1" prop="eduInfoDto.cultureLevel">
+                <el-select
+                  v-model.trim="form.eduInfoDto.cultureLevel"
+                  placeholder="请选择"
+                  size="small"
+                  class="list_item_width_1"
+                  clearable
+                >
+                  <el-option
+                    v-for="(item, index) in dicts.educationList"
+                    :key="index"
+                    :label="item.label"
+                    :value="item.value"
+                  ></el-option>
+                </el-select>
+              </el-form-item>
+           
+              <el-form-item label="婚姻状况" class="flex_item_width1" prop="familyInfoDto.marriage">
+                <el-select
+                  v-model.trim="form.familyInfoDto.marriage"
+                  placeholder="请选择"
+                  size="small"
+                  class="list_item_width_1"
+                  clearable
+                >
+                  <el-option
+                    v-for="(item, index) in dicts.marriageList"
+                    :key="index"
+                    :label="item.label"
+                    :value="item.value"
+                    @click.native="handelClickMarriage(item.value)"
+                  ></el-option>
+                </el-select>
+              </el-form-item>
+           
+              <el-form-item
+              class="flex_item_width1"
+                label="配偶情况"
+                prop="familyInfoDto.spouseSituation"  v-if="
+                (form.familyInfoDto &&
+                  form.familyInfoDto.marriage == 'chuhun') ||
+                form.familyInfoDto.marriage == 'zaihun' ||
+                form.familyInfoDto.marriage == 'fuhun'
+              "
+              >
+                <el-select
+                  v-model.trim="form.familyInfoDto.spouseSituation"
+                  placeholder="请选择"
+                  size="small"
+                  class="list_item_width_1"
+                  clearable
+                >
+                  <el-option
+                    v-for="(item, index) in dicts.spouseSituationList"
+                    :key="index"
+                    :label="item.label"
+                    :value="item.value"
+                  ></el-option>
+                </el-select>
+              </el-form-item>
+          
+              <el-form-item label="籍贯" class="flex_item_width1" prop="baseInfoDto.nativePlace">
+                <el-input
+                  v-model.trim="form.baseInfoDto.nativePlace"
+                  placeholder="请输入内容"
+                  clearable
+                  size="small"
+                  class="list_item_width_1"
+                ></el-input>
+                <el-radio-group v-model.trim="form.baseInfoDto.localResidenceFlag" style="margin-left: 10px;">
+                  <el-radio
+                    :label="1"
+                    @click.native.prevent="handleLocalRadio($event, 1)"
+                    >本地</el-radio
+                  >
+                  <el-radio
+                    :label="0"
+                    @click.native.prevent="handleLocalRadio($event, 0)"
+                    v-show="false"
+                    >非本地</el-radio
+                  >
+                </el-radio-group>
+              </el-form-item>
+          <el-form-item label="备注" prop="baseInfoDto.remark" class="flex_item_width2">
+            <el-input
+              type="textarea"
+              class="item_width_1"
+              :rows="3"
+              placeholder="请输入内容"
+              v-model.trim="form.baseInfoDto.remark"
+              clearable
+            >
+            </el-input>
+          </el-form-item>
+        </div>
+        <h5>居住信息登记</h5>
+          <section
+            v-for="(rowItem, index) in this.form.resideInfoDtos"
+            :key="index"
+          >
+          <div class="flex_box">  
+             <el-form-item
+                  label="所属组织"
+                  class="font-color-orange flex_item_width1"
+                  :prop="`resideInfoDtos[${index}].gridId`"
+                  :rules="[
+                    {
+                      required: true,
+                      message: '请选择所属组织',
+                      trigger: 'blur',
+                    },
+                  ]"
+                >
+                  <el-cascader
+                    class="list_item_width_1"
+                    ref="myCascader"
+                    clearable
+                    size="small"
+                    v-model.trim="form.resideInfoDtos[index].gridId"
+                    :options="form.resideInfoDtos[index].orgOptions"
+                    :props="orgOptionProps"
+                    @change="handleChangeAgency(index)"
+                    :disabled="rowItem.accessable === 0"
+                  ></el-cascader>
+                </el-form-item>
+            
+                <el-form-item
+                  :prop="`resideInfoDtos[${index}].villageId`"
+                  label="所属房屋"
+                  label-width="100px"
+                  class="font-color-orange flex_item_width4"
+                  :rules="[
+                    { required: true, message: '请选择小区', trigger: 'blur' },
+                  ]"
+                >
+                  <el-select
+                    v-model.trim="form.resideInfoDtos[index].villageId"
+                    placeholder="请选择小区"
+                    size="small"
+                    class=" f-bto0"
+                    clearable
+                    @change="handleChangeV(index)"
+                    :disabled="rowItem.accessable === 0"
                   >
                     <el-option
-                      v-for="item in optionsB"
+                      v-for="item in rowItem.optionsV"
                       :key="item.value"
                       :label="item.label"
-                      :value="item.value">
+                      :value="item.value"
+                    >
                     </el-option>
                   </el-select>
-                </div>
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-              <el-form-item :prop="form.HOME_ID" label="所属家庭">
-                <div class="resi-cell-value">
-                  <el-select v-model.trim="form.HOME_ID" :disabled="disabled" placeholder="请选择" size="small"
-                  clearable class="resi-cell-select"
+                </el-form-item>
+                <el-form-item
+                  :prop="`resideInfoDtos[${index}].buildId`"
+                  label-width="0"
+                  style="margin: 0px"
+                  :rules="[
+                    { required: true, message: '请选择楼栋', trigger: 'blur' },
+                  ]"
+                >
+                  <el-select
+                    v-model.trim="form.resideInfoDtos[index].buildId"
+                    placeholder="楼号"
+                    size="small"
+                    clearable
+                    @change="handleChangeB(index)"
+                    class="flex_item_width3 f-bto0"
+                    :disabled="rowItem.accessable === 0"
                   >
                     <el-option
-                      v-for="item in optionsH"
+                      v-for="item in rowItem.optionsB"
                       :key="item.value"
                       :label="item.label"
-                      :value="item.value">
+                      :value="item.value"
+                    >
                     </el-option>
                   </el-select>
-                </div>
-            </el-form-item>
-          </el-col> -->
-        </el-row>
-        <el-row v-for="(item, index) in sliceList(formList, columns)"
-                :key="index"
-                class="resi-row" :class="{'width-40':index==3||index==2||index==4||index==5}">
-          <!-- <el-col v-for="n in item" :key="n.id" :span="n.itemType === 'textarea'&&24 || (24/columns)"> -->
-          <el-col v-for="n in item"
-                  :key="n.itemId"
-                  :span="item.length === 1 ? 24 : (24/columns) "
-                  :style="n.itemType === 'divider' && 'display: none;'">
-            <el-form-item :prop="n.columnName"
-                          :label="n.itemType != 'radio'?n.label:''">
-              <!-- <div class="resi-cell"> -->
-              <!-- <div class="resi-cell-label">{{n.label}}</div> -->
-              <div class="resi-cell-value">
-
-                <template v-if="n.itemType === 'input' || n.itemType === 'textarea'">
-                  <!-- <span v-if="n.columnName==='MOBILE'||n.columnName==='ID_CARD'">{{ form[n.columnName]||'--'}}</span> -->
-                  <el-input v-if="n.columnName==='MOBILE'||n.columnName==='ID_CARD'"
-                            v-model.trim="form[n.columnName]"
-                            :disabled="disabled"
-                            class="resi-cell-input"
-                            size="small"
-                            clearable
-                            placeholder="请输入内容">
-                  </el-input>
-
-                  <el-input v-else-if="n.validType"
-                            v-model.trim="form[n.columnName]"
-                            :disabled="disabled"
-                            class="resi-cell-input"
-                            size="small"
-                            clearable
-                            placeholder="请输入内容">
-                  </el-input>
-                  <el-input v-else
-                            v-model.trim="form[n.columnName]"
-                            :disabled="disabled"
-                            class="resi-cell-input"
-                            size="small"
-                            clearable
-                            placeholder="请输入内容">
-                  </el-input>
-                </template>
-                <!-- <template v-if="n.itemType === 'textarea'">
-                      <el-input
-                        v-model.trim="form[n.columnName]"
-                        class="resi-cell-textarea"
-                        size="small"
-                        type="textarea"
-                        clearable
-                        placeholder="请输入内容"
-                        >
-                      </el-input>
-                    </template> -->
-                <el-date-picker v-else-if="n.itemType === 'datepicker'"
-                                v-model.trim="form[n.columnName]"
-                                :disabled="disabled"
-                                class="resi-cell-input"
-                                type="date"
-                                size="small"
-                                clearable
-                                placeholder="选择日期"
-                                format="yyyy 年 MM 月 dd 日"
-                                value-format="yyyy-MM-dd">
-                </el-date-picker>
-                <el-date-picker v-else-if="n.itemType === 'daterange'"
-                                v-model.trim="form[n.columnName]"
-                                :disabled="disabled"
-                                type="daterange"
-                                align="right"
-                                unlink-panels
-                                value-format="yyyy-MM-dd"
-                                range-separator="至"
-                                start-placeholder="开始日期"
-                                end-placeholder="结束日期">
+                </el-form-item>
+                <el-form-item
+                  :prop="`resideInfoDtos[${index}].unitId`"
+                  label-width="0"
+                  style="margin: 0px"
+                  :rules="[
+                    { required: true, message: '请选择单元', trigger: 'blur' },
+                  ]"
+                >
+                  <el-select
+                    v-model.trim="form.resideInfoDtos[index].unitId"
+                    placeholder="单元"
+                    size="small"
+                    clearable
+                    class="flex_item_width3 f-bto0"
+                    @change="handleChangeD(index)"
+                    :disabled="rowItem.accessable === 0"
+                  >
+                    <el-option
+                      v-for="item in rowItem.optionsD"
+                      :key="item.value"
+                      :label="item.label"
+                      :value="item.value"
+                    >
+                    </el-option>
+                  </el-select>
+                </el-form-item>
+                <el-form-item
+                  :prop="`resideInfoDtos[${index}].homeId`"
+                  label-width="0"
+                  style="margin: 0px"
+                  :rules="[
+                    { required: true, message: '请选择房屋', trigger: 'blur' },
+                  ]"
+                  :disabled="rowItem.accessable === 0"
+                >
+                  <el-select
+                    v-model.trim="form.resideInfoDtos[index].homeId"
+                    placeholder="房号"
+                    size="small"
+                    clearable
+                    class="flex_item_width3 f-bto0"
+                    @change="handleChangeH(index)"
+                    :disabled="rowItem.accessable === 0"
+                  >
+                    <el-option
+                      v-for="item in rowItem.optionsH"
+                      :key="item.value"
+                      :label="item.label"
+                      :value="item.value"
+                    >
+                    </el-option>
+                  </el-select>
+                </el-form-item>
+                <el-button
+                  type="primary"
+                  size="mini"
+                  icon="el-icon-plus"
+                  circle
+                  @click="handelClickAddHouse"
+                  style="margin-left: 16px; height: 30px"
+                ></el-button>
+                <el-button
+                  type="danger"
+                  v-if="form.resideInfoDtos.length > 1 && rowItem.accessable !== 0"
+                  size="small"
+                  icon="el-icon-minus"
+                  @click="handelClickDelHouse(index)"
+                  style="height: 30px"
+                  circle
+                >
+                </el-button>
+              </div>
+          <div class="flex_box">
+            <el-form-item label="人房关系" class="font-color-blue flex_item_width1">
+                  <el-select
+                    v-model.trim="form.resideInfoDtos[index].resiHouseRel"
+                    placeholder="请选择"
+                    size="small"
+                    class="list_item_width_1"
+                    @change="handelChangeResiHouseRel($event, index)"
+                    clearable
+                    :disabled="rowItem.accessable === 0"
+                  >
+                    <el-option
+                      v-for="(item, i) in dicts.resiHouseRelList"
+                      :key="i"
+                      :label="item.label"
+                      :value="item.value"
+                    ></el-option>
+                  </el-select>
+                </el-form-item>
+                <el-form-item label="人户状况" class="font-color-blue flex_item_width1">
+                  <el-select
+                    v-model.trim="form.resideInfoDtos[index].householdSituation"
+                    placeholder="请选择"
+                    size="small"
+                    class="list_item_width_1"
+                    clearable
+                    :disabled="rowItem.accessable === 0"
+                  >
+                    <el-option
+                      v-for="(item, index) in dicts.householdSituationList"
+                      :key="index"
+                      :label="item.label"
+                      :value="item.value"
+                    ></el-option>
+                  </el-select>
+                </el-form-item>
+                <el-form-item
+                  label="与户主关系"
+                  class="font-color-blue font-color-blue2 flex_item_width1"
+                >
+                  <el-select
+                    v-model.trim="form.resideInfoDtos[index].houseHolderRel"
+                    placeholder="请选择"
+                    size="small"
+                    class="list_item_width_1"
+                    clearable
+                    :disabled="rowItem.accessable === 0"
+                  >
+                    <el-option
+                      v-for="(item, index) in dicts.houseHolderRelList"
+                      :key="index"
+                      :label="item.label"
+                      :value="item.value"
+                    ></el-option>
+                  </el-select>
+                </el-form-item>
+           
+                <el-form-item label="户籍所在地" v-if="form.resideInfoDtos[index].householdSituation == 'rzhbz'" class="flex_item_width1">
+                  <el-input
+                    class="list_item_width_1"
+                    v-model.trim="form.resideInfoDtos[index].placeOfDomicile"
+                    placeholder="请输入内容"
+                    size="small"
+                    clearable
+                    :disabled="rowItem.accessable === 0"
+                  ></el-input>
+                </el-form-item>
+             
+                <el-form-item label="现居住地址"   v-else-if="
+                  form.resideInfoDtos[index].householdSituation == 'hzrbz'
+                " class="flex_item_width1">
+                  <el-input
+                    class="list_item_width_1"
+                    v-model.trim="form.resideInfoDtos[index].currentResidence"
+                    placeholder="请输入内容"
+                    size="small"
+                    :disabled="rowItem.accessable === 0"
+                    clearable
+                  ></el-input>
+                </el-form-item>
+             
+                <el-form-item label="迁出时间" 
+                 class="flex_item_width1"  v-else-if="
+                  form.resideInfoDtos[index].householdSituation == 'rhdbz'
+                ">
+                  <el-date-picker
+                    v-model.trim="form.resideInfoDtos[index].outOfTime"
+                    class="list_item_width_1"
+                    type="date"
+                    size="small"
+                    clearable
+                    placeholder="选择日期"
+                    format="yyyy 年 MM 月 dd 日"
+                    value-format="yyyy-MM-dd"
+                    :disabled="rowItem.accessable === 0"
+                  >
+                  </el-date-picker>
+                </el-form-item>
+          </div> 
+          </section>
+        <h5>拓展信息登记</h5>
+        <div class="flex_box">
+         
+              <el-form-item class="flex_item_width1" label="宗教信仰" prop="religionDto.religion">
+                <el-input
+                  class="list_item_width_1"
+                  v-model.trim="form.religionDto.religion"
+                  placeholder="请输入内容"
+                  size="small"
+                  clearable
+                ></el-input>
+              </el-form-item>
+            
+              <el-form-item
+                label="就业状态"
+                class="font-color-blue flex_item_width1"
+                prop="workInfoDto.careerStatus"
+              >
+                <el-select
+                  v-model.trim="form.workInfoDto.careerStatus"
+                  placeholder="请选择"
+                  size="small"
+                  class="list_item_width_1"
+                  clearable
+                >
+                  <el-option
+                    v-for="(item, index) in dicts.careerStatusList"
+                    :key="index"
+                    :label="item.label"
+                    :value="item.value"
+                    @click.native="handelClickCareerStatus(item.value)"
+                  ></el-option>
+                </el-select>
+              </el-form-item>
+            
+              <el-form-item label="工作单位" class="flex_item_width1" prop="workInfoDto.workUnit" v-if="
+                form.workInfoDto.careerStatus >= 1 &&
+                form.workInfoDto.careerStatus <= 5
+              ">
+                <el-input
+                  class="list_item_width_1"
+                  v-model.trim="form.workInfoDto.workUnit"
+                  placeholder="请输入内容"
+                  size="small"
+                  clearable
+                ></el-input>
+              </el-form-item>
+            
+              <el-form-item  v-if="
+                form.workInfoDto.careerStatus >= 1 &&
+                form.workInfoDto.careerStatus <= 5
+              " label="职业" class="flex_item_width1" prop="workInfoDto.occupation">
+                <el-input
+                  class="list_item_width_1"
+                  v-model.trim="form.workInfoDto.occupation"
+                  placeholder="请输入内容"
+                  size="small"
+                  clearable
+                ></el-input>
+              </el-form-item>
+               <el-form-item v-if="
+                (form.workInfoDto.careerStatus == 0 ||
+                  form.workInfoDto.careerStatus == 6) &&
+                form.workInfoDto.careerStatus
+              "
+              class="flex_item_width1"
+                label="原工作单位"
+                prop="unemployedDto.originWorkUnit"
+              >
+                <el-input
+                  class="list_item_width_1"
+                  v-model.trim="form.unemployedDto.originWorkUnit"
+                  placeholder="请输入内容"
+                  size="small"
+                  clearable
+                ></el-input>
+              </el-form-item>
+              
+              <el-form-item class="flex_item_width1" v-if="
+                (form.workInfoDto.careerStatus == 0 ||
+                  form.workInfoDto.careerStatus == 6) &&
+                form.workInfoDto.careerStatus
+              "
+                label="失业时间"
+                prop="unemployedDto.unemploymentTime"
+              >
+                <el-date-picker
+                  v-model.trim="form.unemployedDto.unemploymentTime"
+                  class="list_item_width_1"
+                  type="date"
+                  size="small"
+                  clearable
+                  placeholder="选择日期"
+                  format="yyyy 年 MM 月 dd 日"
+                  value-format="yyyy-MM-dd"
+                >
                 </el-date-picker>
-                <el-time-picker v-else-if="n.itemType === 'timepicker'"
-                                v-model.trim="form[n.columnName]"
-                                :disabled="disabled"
-                                placeholder="任意时间点">
-                </el-time-picker>
-                <el-time-picker v-else-if="n.itemType === 'timerange'"
-                                v-model.trim="form[n.columnName]"
-                                :disabled="disabled"
-                                is-range
-                                range-separator="至"
-                                start-placeholder="开始时间"
-                                end-placeholder="结束时间"
-                                placeholder="选择时间范围">
-                </el-time-picker>
-                <el-select v-else-if="n.itemType === 'select'"
-                           v-model.trim="form[n.columnName]"
-                           :multiple="n.multiSelect"
-                           :disabled="disabled"
-                           placeholder="请选择"
-                           size="small"
-                           clearable
-                           class="resi-cell-select">
-                  <el-option v-for="item in n.options || options"
-                             :key="item.value"
-                             :label="item.label"
-                             :value="item.value">
-                  </el-option>
+              </el-form-item>
+          
+       
+              <el-form-item label="月收入" class="flex_item_width1"  v-if="
+              form.workInfoDto.careerStatus >= 1 &&
+              form.workInfoDto.careerStatus <= 5
+            " prop="economyDto.monthIncome">
+                <el-input
+                  class="list_item_width_1"
+                  v-model.trim="form.economyDto.monthIncome"
+                  placeholder="请输入内容"
+                  size="small"
+                  clearable
+                ></el-input>
+              </el-form-item>
+           
+              <el-form-item  class="flex_item_width1"
+                label="失业证号"
+                prop="unemployedDto.unemploymentNum"
+                v-if="
+              (form.workInfoDto.careerStatus == 0 ||
+                form.workInfoDto.careerStatus == 6) &&
+              form.workInfoDto.careerStatus
+            "
+              >
+                <el-input
+                  class="list_item_width_1"
+                  v-model.trim="form.unemployedDto.unemploymentNum"
+                  placeholder="请输入内容"
+                  size="small"
+                  clearable
+                ></el-input>
+              </el-form-item>
+          
+              <el-form-item  class="flex_item_width1"
+                label="失业原因"
+                prop="unemployedDto.unemploymentReason"
+                v-if="
+              (form.workInfoDto.careerStatus == 0 ||
+                form.workInfoDto.careerStatus == 6) &&
+              form.workInfoDto.careerStatus
+            "
+              >
+                <el-select
+                  v-model.trim="form.unemployedDto.unemploymentReason"
+                  placeholder="请选择"
+                  size="small"
+                  class="list_item_width_1"
+                  clearable
+                >
+                  <el-option
+                    v-for="(item, index) in dicts.unemploymentReasonList"
+                    :key="index"
+                    :label="item.label"
+                    :value="item.value"
+                  ></el-option>
                 </el-select>
-                <!-- <el-cascader
-                      :options="options"
-                      :props="{ checkStrictly: true }"
-                      clearable></el-cascader> -->
-                <el-cascader v-else-if="n.itemType === 'cascader'"
-                             v-model.trim="form[n.columnName]"
-                             :options="n.options"
-                             :disabled="disabled"
-                             :props="{ emitPath: false }"
-                             clearable
-                             size="small"
-                             class="resi-cell-select">
-                </el-cascader>
-                <template v-else-if="n.itemType === 'radio'">
-                  <!-- <el-radio v-for="ns in n.options"
-                            :key="ns.value"
-                            v-model.trim="form[n.columnName]"
-                            :disabled="disabled"
-                            :label="ns.value">
-                    {{ ns.label }}
-                  </el-radio> -->
-                  <el-checkbox-group v-model.trim="form[n.columnName]">
-                    <el-checkbox 
-                                 :key="n.value"
-                                 :label="n.value"
-                                 :disabled="disabled">{{n.label}}</el-checkbox>
-                    <!-- <el-checkbox label="n.la"></el-checkbox> -->
-                  </el-checkbox-group>
-                  <!-- <el-radio v-model.trim="form[n.columnName]" label="1">备选项</el-radio> -->
-                </template>
-                <template v-else-if="n.itemType === 'checkbox'">
-                  <el-checkbox-group v-model.trim="form[n.columnName]">
-                    <el-checkbox v-for="ns in n.options"
-                                 :key="ns.value"
-                                 :label="ns.value"
-                                 :disabled="disabled">{{ns.label}}</el-checkbox>
-                    <!-- <el-checkbox label="n.la"></el-checkbox> -->
-                  </el-checkbox-group>
-                </template>
-              </div>
-              <!-- </div> -->
-            </el-form-item>
+              </el-form-item>
+           
+              <el-form-item  class="flex_item_width1"
+                label="再就业优惠证号"
+                prop="unemployedDto.employmentNum"
+                v-if="
+              (form.workInfoDto.careerStatus == 0 ||
+                form.workInfoDto.careerStatus == 6) &&
+              form.workInfoDto.careerStatus
+            "
+              >
+                <el-input
+                  class="list_item_width_1"
+                  v-model.trim="form.unemployedDto.employmentNum"
+                  placeholder="请输入内容"
+                  size="small"
+                  clearable
+                ></el-input>
+              </el-form-item>
+           
+              <el-form-item label="技术特长"  class="flex_item_width1" prop="unemployedDto.specialSkill"  v-if="
+              (form.workInfoDto.careerStatus == 0 ||
+                form.workInfoDto.careerStatus == 6) &&
+              form.workInfoDto.careerStatus
+            ">
+                <el-input
+                  class="list_item_width_1"
+                  v-model.trim="form.unemployedDto.specialSkill"
+                  placeholder="请输入内容"
+                  size="small"
+                  clearable
+                ></el-input>
+              </el-form-item>
+          
+         
+              <el-form-item v-if="
+              (form.workInfoDto.careerStatus == 0 ||
+                form.workInfoDto.careerStatus == 6) &&
+              form.workInfoDto.careerStatus
+            "
+              class="flex_item_width1"
+                label="是否领取失业金"
+                prop="unemployedDto.unempCompensationFlag"
+              >
+                <el-radio-group
+                  v-model.trim="form.unemployedDto.unempCompensationFlag"
+                >
+                  <el-radio
+                    :label="item.value"
+                    v-for="item in disabilityFlagList"
+                    :key="item.value"
+                    >{{ item.label }}</el-radio
+                  >
+                </el-radio-group>
+              </el-form-item>
+    
+              <el-form-item v-if="
+              (form.workInfoDto.careerStatus == 0 ||
+                form.workInfoDto.careerStatus == 6) &&
+              form.workInfoDto.careerStatus
+            "
+              class="flex_item_width1"
+                label="是否就业困难对象"
+                prop="unemployedDto.employmentHardFlag"
+              >
+                <el-radio-group v-model.trim="form.unemployedDto.employmentHardFlag">
+                  <el-radio
+                    :label="item.value"
+                    v-for="item in disabilityFlagList"
+                    :key="item.value"
+                    >{{ item.label }}</el-radio
+                  >
+                </el-radio-group>
+              </el-form-item>
+           
+              <el-form-item v-if="
+              (form.workInfoDto.careerStatus == 0 ||
+                form.workInfoDto.careerStatus == 6) &&
+              form.workInfoDto.careerStatus
+            "
+              class="flex_item_width1"
+                label="劳动就业愿望"
+                prop="workInfoDto.employmentWish"
+              >
+                <el-select
+                  v-model.trim="form.workInfoDto.employmentWish"
+                  placeholder="请选择"
+                  size="small"
+                  class="list_item_width_1"
+                  clearable
+                >
+                  <el-option
+                    v-for="(item, index) in dicts.employmentWishList"
+                    :key="index"
+                    :label="item.label"
+                    :value="item.value"
+                  ></el-option>
+                </el-select>
+              </el-form-item>
+           
+         
+              
+              <el-form-item label="有无赡养人" class="flex_item_width1" prop="familyInfoDto.elderlyFlag">
+                <el-radio-group v-model.trim="form.familyInfoDto.elderlyFlag">
+                  <el-radio
+                    :label="item.value"
+                    v-for="item in hasOptions"
+                    :key="item.value"
+                    @click.native="handelClickelderly"
+                    >{{ item.label }}</el-radio
+                  >
+                </el-radio-group>
+              </el-form-item>
+          
+              <el-form-item
+              v-if="form.familyInfoDto.elderlyFlag == 1" class="flex_item_width1"
+                label="与赡养人关系"
+                prop="familyInfoDto.elderlyRelation"
+              >
+                <el-select
+                  v-model.trim="form.familyInfoDto.elderlyRelation"
+                  placeholder="请选择"
+                  size="small"
+                  class="list_item_width_1"
+                  clearable
+                >
+                  <el-option
+                    v-for="(item, index) in dicts.houseHolderRelList"
+                    :key="index"
+                    :label="item.label"
+                    :value="item.value"
+                  ></el-option>
+                </el-select>
+              </el-form-item>
+              <el-form-item
+              v-if="form.familyInfoDto.elderlyFlag == 1" class="flex_item_width1"
+                label="赡养人联系电话"
+                prop="familyInfoDto.dependantMobile"
+              >
+                <el-input
+                  class="list_item_width_1"
+                  v-model.trim="form.familyInfoDto.dependantMobile"
+                  placeholder="请输入内容"
+                  size="small"
+                  clearable
+                ></el-input>
+              </el-form-item>
+        </div>
+        <h5>人员标签</h5>
+        <div class="stafftag">
+          <stafftag
+            :formType="'edit'"
+            :userInfo="form"
+            @showDialog="showDialog"
+          >
+          </stafftag>
+        </div>
+        <resi-expand
+          ref="resiExpand"
+          @submitExpand="submitExpand"
+        ></resi-expand>
+        <el-row style="margin: 24px">
+          <el-col :span="24" align="center">
+            <el-button
+              size="small"
+              class="diy-button--white"
+              @click="handlerCancle"
+              plain
+              >取消</el-button
+            >
+            <el-button
+              type="primary"
+              size="small"
+              @click="handleClickSubmit"
+              :loading="btnLoading"
+              >保存</el-button
+            >
+            <el-button
+              type="primary"
+              size="small"
+              @click="handleClickSubmit('house')"
+              :loading="btnLoading"
+              >提交并补充家庭人员信息</el-button
+            >
           </el-col>
         </el-row>
-      </template>
-    </el-form>
+      </el-form>
+      <el-dialog :title="dialogTitle" :visible.sync="dialogVisible" destroy-on-close width="1028px">
+            <add-expand ref="addExpand" @submitExpand="submitExpandAdd" @hideExpand="hideExpand"
+                :operationType="'add'"></add-expand>
+        </el-dialog>
+    </div>
   </div>
 </template>
 
 <script>
-import { isCard, isMobile, isPhone } from '@/utils/validate'
-import { requestPost } from "@/js/dai/request";
-
+import { requestGet, requestPost } from "@/js/dai/request";
+import {
+  isCard,
+  isPassport,
+  isMobile,
+  isPhone,
+  isHKPassport,
+  isTwPassport,
+  isSoldier,
+} from "@/utils/validate";
+import { computedCard } from "@/utils/index";
+import {
+  idTypeList,
+  genderList,
+  hasOptions,
+  disabilityFlagList,
+} from "@/js/columns/constants";
+import stafftag from "../modules/portrayal/jumin/cpts/staffTag.vue";
+import resiExpand from "./resiExpand/editExpand.vue";
+import addExpand from "./resiExpand/index.vue";
 
 export default {
-  name: 'editForm',
-  props: {
-    editUserId: {
-      type: String,
-      default: ''
-    },
-    fixed: {
-      type: Boolean,
-      default: false
-    },
-    labelWidth: {
-      type: String,
-      default: '100px'
-    },
-    formId: {
-      type: String,
-      default: 'resiForm'
-    },
-    agencyId: {
-      type: String,
-      default: ''
-    },
-    formList: {
-      type: Array,
-      default: function () {
-        return []
-      }
-    },
-    formInfo: {
-      type: Object,
-      default: function () {
-        return {}
-      }
-    },
-    mutiList: {
-      type: Array,
-      default: function () {
-        return []
-      }
-    },
-    // 渲染一行几列
-    columns: {
-      type: Number,
-      default: 3
-    },
-    supportAdd: { // 单表多条数据
-      type: Boolean,
-      default: false
-    },
-    disabled: { // 单表多条数据
-      type: Boolean,
-      default: false
-    }
-  },
-  data () {
-    // let form = {}
-    // let rules = {}
-    let checkMObile = (rule, value, callback) => {
-      if (value === '') {
-        callback(new Error('请输入联系电话'))
-      } else {
-        if (!isMobile(value) && !isPhone(value)) {
-          callback(new Error('联系电话格式不正确'))
-        }
-        callback()
-      }
-    }
-    let checkIdCard = (rule, value, callback) => {
-      if (value === '') {
-        callback(new Error('请输入证件号'))
-      } else {
-        if (!isCard(value)) {
-          callback(new Error('请输入正确的证件号或护照号'))
-        }
-        callback()
-      }
-    }
-    let initForm = (obj, arr) => {
-      let _form = {}
-      // console.log('formInfo', obj)
-      if (Object.keys(obj).length > 0) {
-        _form = { ...obj }
-        // return _form
-      }
-      const itemTypes = ['daterange', 'timerange']
-      arr.forEach(item => {
-        if (item.multiSelect || itemTypes.includes(item.itemType)) {
-          if (item.columnValue && item.columnValue.indexOf(',') > -1) _form[item.columnName] = item.columnValue.split(',')
-          else _form[item.columnName] = (item.columnValue && [item.columnValue]) || []
-        } else _form[item.columnName] = item.columnValue || ''
-      })
-      // console.log('_from0000---', arr)
-      return _form
-    }
-    let initRules = (arr) => {
-      let rules = {}
-      arr.forEach(item => {
-        if (item.required) {
-          if (item.validType === 'mobile') {
-            rules[item.columnName] = [
-              { required: true, validator: checkMObile, trigger: 'blur' }
-            ]
-          } else if (item.validType === 'id_card') {
-            rules[item.columnName] = [
-              { required: true, validator: checkIdCard, trigger: 'blur' }
-            ]
-          } else {
-            rules[item.columnName] = [
-              { required: true, message: `请输入${item.label}`, trigger: 'blur' }
-            ]
-          }
-        }
-      })
-      return rules
-    }
-    let form = initForm(this.formInfo, this.formList)
-    let rules = initRules(this.formList)
-    let tempFormList = [...this.formList]
-    let constForm = {
-      ...form
-    }
-    console.log('-----------------哈哈哈哈哈哈rules', rules)
+  data() {
     return {
-      openSearch: false,
-      fixedForm: {
-        GRID_ID: '',
-        VILLAGE_ID: '',
-        BUILD_ID: '',
-        UNIT_ID: '',
-        HOME_ID: ''
+      loading: false,
+      dialogTitle:null,
+      dialogVisible:false,
+      houseType: true,
+      formList: [],
+      orgOptions: [],
+      orgOptionProps: {
+        value: "agencyId",
+        label: "agencyName",
+        children: "subAgencyList",
+        emitPath: false,
+        multiple: false,
+        checkStrictly: true,
       },
-      fixedList: {},
+
+      resiId: this.$route.query.id,
       form: {
-        ...form
+        baseInfoDto: {
+          name: null, //姓名
+          idType: null, //证件类型
+          idNum: null, //身份证号
+          nationality: null, //国籍
+          mobile: null, //手机号
+          gender: null, //性别
+          birthday: null, //出生日期
+          nation: null, //民族
+          localResidenceFlag: 0, //是否本地户籍
+          nativePlace: null, //籍贯,
+          remark: null, //备注
+          categoryInfo: {
+            partyFlag: 0,
+            subsistenceAllowanceFlag: 0,
+            ensureHouseFlag: 0,
+            unemployedFlag: 0,
+            fertileWomanFlag: 0,
+            veteranFlag: 0,
+            unitedFrontFlag: 0,
+            petitionOfficerFlag: 0,
+            volunteerFlag: 0,
+            oldPeopleFlag: 0,
+            emptyNesterFlag: 0,
+            specialSupportFlag: 0,
+            disabledFlag: 0,
+            dementedFlag: 0,
+            disabilityFlag: 0,
+            seriousIllnessFlag: 0,
+            chronicDiseaseFlag: 0,
+            specialCrowdFlag: 0,
+            tenantFlag: 0,
+            floatingFlag: 0,
+            liveAloneFlag: 0,
+            publicWelfareFlag: 0,
+            buildingChiefFlag: 0,
+            unitChiefFlag: 0,
+            riskyFlag: 0,
+            delFlag: 0,
+          },
+        },
+        eduInfoDto: {
+          cultureLevel: null, //文化程度
+        },
+        familyInfoDto: {
+          marriage: null, //婚姻状况
+          spouseSituation: null, //配偶情况
+          elderlyFlag: null, //有无赡养人
+          elderlyRelation: null, //与赡养人关系
+          dependantMobile: null, //赡养人联系电话
+        },
+        resideInfoDtos: [
+          {
+            agencyName: this.$store.state.user.agencyName,
+            agencyId: this.$store.state.user.agencyId,
+            gridId: null, //所属网格id
+            villageId: null, //小区id
+            buildId: null, //楼栋id
+            unitId: null, //单元id
+            moveOutFlag: null,
+            outOfTime: null, //迁出时间
+            homeId: null, //房屋id
+            placeOfDomicile: null, //户籍所在地
+            currentResidence: null, //现居住地
+            householdSituation: null, //人户状况
+            houseHolderRel: null, //与户主关系
+            resiHouseRel: null, //人房关系
+            optionsV: [],
+            optionsB: [],
+            optionsH: [],
+            optionsD: [],
+            orgOptions: [],
+          },
+        ],
+        religionDto: {
+          religion: null, //宗教信仰
+        },
+        workInfoDto: {
+          careerStatus: null, //就业状况
+          workUnit: null, //工作单位
+          occupation: null, //职业
+        },
+        specialDto: {
+          specialCategoryCodes: [],
+        },
+        unemployedDto: {
+          originWorkUnit: null, //原工作单位
+          unemploymentTime: null, //失业时间yyyy-MM-dd
+          unemploymentNum: null, //失业证号
+          employmentNum: null, //再就业优惠证号
+          specialSkill: null, //技术特长
+          unempCompensationFlag: null, //是否领取失业补助金
+          unemploymentReason: null, //失业原因【字典表】code
+          employmentHardFlag: null, //是否就业困难对象；1是0不是
+          employmentWish: null, //劳动能力就业愿望
+        },
+        economyDto: {
+          monthIncome: null, //月收入
+        },
       },
-      constForm,
-      tempFormList,
-      addCount: 0,
-      addList: [],
-      rulesForm: {
-        ...rules,
-        VILLAGE_ID: [{ required: true, message: `请选择小区`, trigger: 'blur' }],
-        GRID_ID: [{ required: true, message: `请选择网格`, trigger: 'blur' }],
-        BUILD_ID: [{ required: true, message: `请选择楼号`, trigger: 'blur' }],
-        UNIT_ID: [{ required: true, message: `请选择单元`, trigger: 'blur' }],
-        HOME_ID: [{ required: true, message: `请选择房号`, trigger: 'blur' }]
+      orgOption: [],
+      footerInputList: [
+        {
+          id: "healthDto",
+
+          children: [
+            {
+              label: "残疾类别",
+              check:'fourFont',
+              itemType: "select1",
+              pformName: "healthDto",
+              formName: "disabilityCategoryCode",
+              opctionUrl: "sys/dict/data/dictlist",
+              opctionParams: { dictType: "disability_category_code" },
+              opction: [],
+            },
+            {
+              label: "残疾等级",
+              itemType: "select1",
+              check:'fourFont',
+              pformName: "healthDto",
+              formName: "disabilityLevel",
+              opctionUrl: "sys/dict/data/dictlist",
+              opctionParams: { dictType: "disability_level" },
+              opction: [],
+            },
+            {
+              label: "残疾证号",
+              pformName: "healthDto",
+              itemType: "input1",
+              check:'fourFont',
+              formName: "disabilityNum",
+            },
+            {
+              label: "残疾说明",
+              pformName: "healthDto",
+              itemType: "input1",
+              formName: "disabilityDesc",
+            },
+            {
+              label: "监护人",
+              itemType: "radio1",
+              pformName: "healthDto",
+              formName: "guardianFlag",
+              opction: [
+                { label: "有", formName: "", value: 1 },
+                { label: "无", formName: "", value: 0 },
+              ],
+            },
+            {
+              label: "监护人姓名",
+              pformName: "healthDto",
+              itemType: "input1",
+              formName: "guardianName",
+            },
+            {
+              label: "监护人联系电话",
+              pformName: "healthDto",
+              itemType: "input1",
+              formName: "guardianMobile",
+            },
+            {
+              label: "技能特长",
+              pformName: "healthDto",
+              itemType: "radio1",
+              formName: "specialSkillFlag",
+              opction: [
+                { label: "有", formName: "", value: 1 },
+                { label: "无", formName: "", value: 0 },
+              ],
+            },
+            {
+              label: "劳动能力",
+              pformName: "healthDto",
+              itemType: "radio1",
+              formName: "workCapacityFlag",
+              opction: [
+                { label: "有", formName: "", value: 1 },
+                { label: "无", formName: "", value: 0 },
+              ],
+            },
+          ],
+        },
+        {
+          id: "seriousIllnessDto",
+          children: [
+            {
+              label: "所患大病",
+              itemType: "checkbox",
+              check:'fourFont',
+              formName: "illnessCodes",
+              opctionUrl: "sys/dict/data/dictlist",
+              opctionParams: { dictType: "illness_code" },
+              opction: [],
+              pformName: "seriousIllnessDto",
+            },
+          ],
+        },
+        {
+          id: "chronicDiseaseDto",
+          children: [
+            {
+              label: "所患慢病",
+              itemType: "checkbox",
+              check:'fourFont',
+              formName: "chronicDiseaseCodes",
+              opctionUrl: "sys/dict/data/dictlist",
+              opctionParams: { dictType: "chronic_disease_code" },
+              opction: [],
+              pformName: "chronicDiseaseDto",
+            },
+          ],
+        },
+        {
+          id: "deathDto",
+          children: [
+            {
+              label: "死亡时间",
+              itemType: "datepicker1",
+              formName: "deathTime",
+              check:'fourFont',
+              pformName: "deathDto",
+            },
+          ],
+        },
+        {
+          id: "oldPeopleDto",
+          children: [
+            {
+              label: "老年人分类",
+              itemType: "checkbox",
+              check:'fiveFont',
+              formName: "oldPeopleCategories",
+              opctionUrl: "sys/dict/data/dictlist",
+              opctionParams: { dictType: "oldPeople_categories" },
+              pformName: "oldPeopleDto",
+              opction:[]
+            },
+            {
+              label: "居住情况",
+              itemType: "select1",
+              check:'fourFont',
+              formName: "resideSituation",
+              opctionUrl: "sys/dict/data/dictlist",
+              opctionParams: { dictType: "reside_situation" },
+              pformName: "oldPeopleDto",
+            },
+            {
+              label: "高龄补助",
+              itemType: "inputNum",
+              formName: "oldSubsidy",
+              check:'fourFont',
+              pformName: "oldPeopleDto",
+            },
+          ],
+        },
+        {
+          id: "subsistenceAllowanceDto",
+          children: [
+            {
+              label: "低保类别",
+              itemType: "select1",
+              check:'fourFont',
+              formName: "category",
+              opctionUrl: "sys/dict/data/dictlist",
+              opctionParams: { dictType: "subsistence_allowance_category" },
+              pformName: "subsistenceAllowanceDto",
+            },
+            {
+              label: "低保享受原因",
+              itemType: "checkbox",
+              check:'sixFont',
+              formName: "reasons",
+              opctionUrl: "sys/dict/data/dictlist",
+              opctionParams: { dictType: "subsistence_allowance_reasons" },
+              opction: [],
+              pformName: "subsistenceAllowanceDto",
+            },
+          ],
+        },
+        {
+          id: "parymemberInfoDto",
+          children: [
+            {
+              check:'fourFont',
+              label: "入党时间",
+              itemType: "datepicker1",
+              formName: "joinTime",
+              pformName: "parymemberInfoDto",
+              opction: [],
+            },
+            {
+              label: "转正时间",
+              itemType: "datepicker1",
+              formName: "positiveTime",
+              pformName: "parymemberInfoDto",
+              opction: [],
+            },
+            {
+              check:'fiveFont',
+              label: "所属党组织",
+              itemType: "cascader1",
+              formName: "partyOrgId",
+              pformName: "parymemberInfoDto",
+              opction: [],
+            },
+            {
+              label: "流动党员",
+              itemType: "radio1",
+              formName: "flowFlag",
+              pformName: "parymemberInfoDto",
+              opction: [
+                { label: "是", value: 1 },
+                { label: "否", value: 0 },
+              ],
+            },
+            {
+              label: "流动党员活动证号",
+              itemType: "input1",
+              formName: "flowActNum",
+              pformName: "parymemberInfoDto",
+            },
+            {
+              label: "党组织职务",
+              itemType: "select1",
+              formName: "partyJob",
+              check:'fiveFont',
+              opctionUrl: "sys/dict/data/dictlist",
+              opctionParams: { dictType: "party_job" },
+              pformName: "parymemberInfoDto",
+              opction: [],
+            },
+            {
+              label: "工作职责",
+              itemType: "input1",
+              formName: "duty",
+              pformName: "parymemberInfoDto",
+            },
+            {
+              label: "是否退休",
+              itemType: "radio1",
+              formName: "retiredFlag",
+              pformName: "parymemberInfoDto",
+              opction: [
+                { label: "是", value: 1 },
+                { label: "否", value: 0 },
+              ],
+            },
+            {
+              label: "党员中心户",
+              itemType: "radio1",
+              check:'fiveFont',
+              formName: "centerFlag",
+              pformName: "parymemberInfoDto",
+              opction: [
+                { label: "是", value: 1 },
+                { label: "否", value: 0 },
+              ],
+            },
+            {
+              label: "免学习",
+              itemType: "radio1",
+              formName: "studyNotNeed",
+              pformName: "parymemberInfoDto",
+              opction: [
+                { label: "是", value: 1 },
+                { label: "否", value: 0 },
+              ],
+            },
+            {
+              label: "入党时所在党支部",
+              itemType: "input1",
+              formName: "joinBranchName",
+              pformName: "parymemberInfoDto",
+            },
+            {
+              label: "组织关系转入社区时间",
+              itemType: "datepicker1",
+              formName: "joinCommunityTime",
+              pformName: "parymemberInfoDto",
+              opction: [],
+            },
+          ],
+        },
+        {
+          id: "ensureHouseDto",
+          children: [
+            {
+              label: "所在社区",
+              itemType: "input1",
+              check:'fourFont',
+              formName: "liveCommunity",
+              pformName: "ensureHouseDto",
+            },
+            {
+              label: "住房性质",
+              itemType: "select1",
+              check:'fourFont',
+              formName: "housingNature",
+              opctionUrl: "sys/dict/data/house",
+              opctionParams: { formCode: "resi_base_info" },
+              pformName: "ensureHouseDto",
+              opction: [],
+            },
+          ],
+        },
+        {
+          id: "veteranDto",
+          children: [
+            {
+              label: "入伍日期",
+              itemType: "datepicker1",
+              check:'fourFont',
+              formName: "joinArmyTime",
+              pformName: "veteranDto",
+              opction: [],
+            },
+            {
+              label: "退伍日期",
+              check:'fourFont',
+              itemType: "datepicker1",
+              formName: "leaveArmyTime",
+              pformName: "veteranDto",
+              opction: [],
+            },
+            {
+              label: "服役单位",
+              itemType: "input1",
+              formName: "serviceUnit",
+              pformName: "veteranDto",
+            },
+            {
+              label: "接收单位",
+              itemType: "input1",
+              formName: "receiveUnit",
+              pformName: "veteranDto",
+            },
+            {
+              label: "待安置补助金",
+              itemType: "inputNum",
+              formName: "settlementAmount",
+              pformName: "veteranDto",
+              opction: [],
+            },
+            {
+              label: "培训状况",
+              itemType: "input1",
+              formName: "trainDesc",
+              pformName: "veteranDto",
+            },
+            {
+              label: "现就业情况",
+              itemType: "input1",
+              formName: "employmentSituation",
+              pformName: "veteranDto",
+            },
+            {
+              label: "是否办理公益性岗位",
+              check:'nineFont',
+              itemType: "radio1",
+              formName: "pubWelfareJobFlag",
+              pformName: "veteranDto",
+              opction: [
+                { label: "是", value: 1 },
+                { label: "否", value: 0 },
+              ],
+            },
+          ],
+        },
+        {
+          id: "unitedFrontDto",
+          children: [
+            {
+              label: "统战类型",
+              check:'fourFont',
+              itemType: "input1",
+              pformName: "unitedFrontDto",
+              formName: "unitedFrontType",
+            },
+          ],
+        },
+        {
+          id: "volunteerDto",
+          children: [
+            {
+              label: "志愿者类别",
+              itemType: "checkbox",
+              formName: "volunteerCategory",
+              pformName: "volunteerDto",
+              opctionUrl: "sys/dict/data/dictlist",
+              opctionParams: { dictType: "VOLUNTEER_CATEGORY" },
+              opction: [],
+            },
+          ],
+        },
+        {
+          id: "specialSupportDto",
+          children: [
+            {
+              label: "特扶类别",
+              check:'fourFont',
+              itemType: "select1",
+              formName: "specialSupportType",
+              pformName: "specialSupportDto",
+              opction: [
+                {
+                  value: "1",
+                  label: "失独",
+                },
+                {
+                  value: "2",
+                  label: "伤残",
+                },
+              ],
+            },
+            {
+              //1
+              label: "子女姓名",
+              check:'fourFont',
+              itemType: "input1",
+              formName: "childName",
+              pformName: "specialSupportDto",
+              opction: [],
+            },
+            {
+              //2
+              label: "子女性别",
+              itemType: "select1",
+              check:'fourFont',
+              formName: "childGender",
+              pformName: "specialSupportDto",
+              opction: [
+                {
+                  value: "1",
+                  label: "男",
+                },
+                {
+                  value: "2",
+                  label: "女",
+                },
+              ],
+            },
+            {
+              label: "子女死亡日期",
+              itemType: "datepicker1",
+              check:'sixFont',
+              formName: "childDeathDate",
+              pformName: "specialSupportDto",
+              opction: [],
+            },
+            {
+              label: "子女伤残类别",
+              itemType: "select1",
+              check:'sixFont',
+              formName: "childDisabilityCategoryCode",
+              opctionUrl: "sys/dict/data/dictlist",
+              pformName: "specialSupportDto",
+              opctionParams: { dictType: "disability_category_code" },
+              opction: [],
+            },
+            {
+              label: "子女伤残等级",
+              itemType: "select1",
+              check:'sixFont',
+              pformName: "specialSupportDto",
+              formName: "childDisabilityLevel",
+              opctionUrl: "sys/dict/data/dictlist",
+              opctionParams: { dictType: "disability_level" },
+              opction: [],
+            },
+          ],
+        },
+      ],
+      workInfoDtoId: null,
+      idTypeList,
+      genderList,
+      hasOptions,
+      disabilityFlagList,
+
+      btnLoading: false,
+      rules: {
+        "baseInfoDto.name": [
+          { required: true, message: "请输入姓名", trigger: "blur" },
+        ],
+        "baseInfoDto.idType": [
+          { required: true, message: "请选择证件类型", trigger: "blur" },
+        ],
+        "baseInfoDto.idNum": [
+          { required: true, message: "请输入证件号码", trigger: "blur" },
+        ],
+        "baseInfoDto.mobile": [
+          { required: true, message: "请输入电话", trigger: "blur" },
+        ],
+        "baseInfoDto.nationality": [
+          { required: true, message: "请选择国籍", trigger: "blur" },
+        ],
       },
-      // rules,
-      value: '',
-      optionsV: [],
-      optionsB: [],
-      optionsH: [],
-      optionsG: [],
-      optionsD: [],
-      pickerOptions: {
-        shortcuts: [{
-          text: '最近一周',
-          onClick (picker) {
-            const end = new Date()
-            const start = new Date()
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
-            picker.$emit('pick', [start, end])
-          }
-        }, {
-          text: '最近一个月',
-          onClick (picker) {
-            const end = new Date()
-            const start = new Date()
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
-            picker.$emit('pick', [start, end])
-          }
-        }, {
-          text: '最近三个月',
-          onClick (picker) {
-            const end = new Date()
-            const start = new Date()
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90)
-            picker.$emit('pick', [start, end])
-          }
-        }]
-      }
-    }
-  },
-  computed: {
-    sliceList () {
-      return function (data, count) {
-        if (data !== undefined) {
-          let index = 0
-          let arrTemp = []
-          let arrTemp1 = []
-          let arr1 = []
-          let arr2 = []
-          let _i = 0
-          let _index = 0
-          for (let i = 0; i < data.length; i++) {
-            if (data[i].itemType === 'divider' || data[i].itemType === 'checkbox') {
-              _i = i + 1
-            }
-          }
-          arr1 = data.slice(0, _i)
-          arr2 = data.slice(_i, data.length)
-          for (let i = 0; i < arr1.length; i++) {
-            index = parseInt(i / count)
-            if (arrTemp.length <= index) {
-              arrTemp.push([])
-            }
-            arrTemp[index].push(arr1[i])
-          }
-          for (let i = 0; i < arr2.length; i++) {
-            _index = parseInt(i / count)
-            if (arrTemp1.length <= _index) {
-              arrTemp1.push([])
-            }
-            arrTemp1[_index].push(arr2[i])
-          }
-          arrTemp = arrTemp.concat(arrTemp1)
-          return arrTemp
-        }
-      }
-    }
-  },
-  watch: {
-    form: {
-      handler (val, val2) {
-        console.log('valpppp----', val, val2)
-        for (let n in val) {
-          if (this.constForm[n] !== val[n]) {
-            this.handleChangeForm(n)
-            console.log('nnnnnn', n)
-            this.handleChangeGroup(n, val[n])
-          }
-        }
-        this.constForm = { ...val }
+      dicts: {
+        educationList: [], //文化程度
+        nationList: [], //民族
+        nationalityList: [], //国籍
+        marriageList: [], //婚姻状况
+        householdSituationList: [], //人户状况
+        houseHolderRelList: [], //与户主关系
+        careerStatusList: [], //就业状况
+        spouseSituationList: [], //配偶情况
+        unemploymentReasonList: [], //失业原因
+        employmentWishList: [], //就业意愿
+        resiHouseRelList: [
+          {
+            label: "自住",
+            value: 0,
+          },
+          {
+            label: "租住",
+            value: 1,
+          },
+        ],
       },
-      deep: true
-    }
+      incidence: {
+        parymemberInfoDto: {
+          formId: "parymemberInfoDto",
+          formType: "parymemberInfoDto",
+          title: "党员信息",
+        },
+        disabilityFlag: {
+          formId: "healthDto",
+          formType: "healthDto",
+          title: "残疾信息",
+        },
+        seriousIllnessFlag: {
+          formId: "seriousIllnessDto",
+          formType: "seriousIllnessDto",
+          title: "大病信息",
+        },
+        chronicDiseaseFlag: {
+          formId: "chronicDiseaseDto",
+          formType: "chronicDiseaseDto",
+          title: "慢病信息",
+        },
+        deathFlag: { formId: "deathDto", formType: "deathDto", title: "死亡" },
+        oldPeopleFlag: {
+          formId: "oldPeopleDto",
+          formType: "oldPeopleDto",
+          title: "老年人信息",
+        },
+        subsistenceAllowanceFlag: {
+          formId: "subsistenceAllowanceDto",
+          formType: "subsistenceAllowanceDto",
+          title: "低保人员信息",
+        },
+        veteranFlag: {
+          formId: "veteranDto",
+          formType: "veteranDto",
+          title: "退役军人信息",
+        },
+        ensureHouseFlag: {
+          formId: "ensureHouseDto",
+          formType: "ensureHouseDto",
+          title: "保障性住房信息",
+        },
+        specialSupportFlag: {
+          formId: "specialSupportDto",
+          formType: "specialSupportDto",
+          title: "特扶人员",
+        },
+        unitedFrontFlag: {
+          formId: "unitedFrontDto",
+          formType: "unitedFrontDto",
+          title: "统战人员",
+        },
+        volunteerFlag: {
+          formId: "volunteerDto",
+          formType: "volunteerDto",
+          title: "志愿者",
+        },
+      },
+      formCopy: null,
+    };
   },
-  created () {
-    this.initForm()
-    console.log('formInfo---gggreg', this.rulesForm)
-    console.log('formList', this.formList)
-    if (this.supportAdd) {
-      this.addList = [...this.mutiList]
-      // console.log('addList----111', this.addList)
-    }
-    if (this.fixed) {
-      this.getGridList()
-      this.getValiheList()
-      this.getBuildList()
-      this.getUniList()
-      this.getHouseList()
-    }
-
+  async created() {
+    this.formCopy = JSON.parse(JSON.stringify(this.form));
   },
-  mounted () {
-    console.log('this.editUserId', this.editUserId)
-    if (this.editUserId) {
-      this.handleTuomin()
-    }
-
+  async activated() {
+    this.resiId = this.$route.query.id;
+    this.loading = true;
+    await this.getDicts();
+    await this.getOrgTreeListAll();
+    await this.getResiDetail();
   },
   methods: {
-    async handleTuomin () {
-
-      const url = "/data/aggregator/epmetuser/detailByType";
-
-      const { data, code, msg } = await requestPost(url, {
-        id: this.editUserId,
-        type: "checkIcResiUser",
-      });
-
-      if (code === 0) {
-        this.$set(this.form, 'MOBILE', data.mobile)
-        this.$set(this.form, 'ID_CARD', data.idCard)
-      } else {
-        this.$message.error(msg);
-      }
-
-
-    },
-    initForm () {
-      this.formList.forEach(async item => {
-        if (item.optionSourceType === 'remote') {
-          await this.getOptionsLists(item.optionSourceValue).then(res => {
-            item.options = this.getTreeData(res)
-          })
-        }
-      })
-    },
-    getTreeData (data) {
-      if (!Array.isArray(data)) return []
-      let arr = data.map(item => {
-        let _item = {}
-        if (item.children) {
-          if (item.children.length === 0) _item = { ...item, children: undefined }
-          else _item = { ...item, children: this.getTreeData(item.children) }
-        } else {
-          _item = { ...item }
-        }
-        return _item
-      })
-      return arr
-    },
-    handleOpenSearch () {
-      this.openSearch = !this.openSearch
-    },
-    handleAddRow () {
-      this.addList.push({
-        row: this.addList.length,
-        itemList: this.formList
-      })
-    },
-    // 监听固定四列
-    handleFiexedForm (val) {
-      let item = {
-        [val]: this.fixedForm[val]
-      }
-      this.fixedList.push(item)
-      this.$set(this.fixedList, val, this.fixedForm[val])
-    },
-    // 监听分组
-    handleChangeGroup (columnName, value) {
-      this.tempFormList.forEach(item => {
-        if (item.columnName === columnName && item.itemType === 'radio' && item.childGroup) {
-          console.log('columnName', item.columnName, columnName)
-          this.$emit('changegroup', { value, childGroup: item.childGroup })
-        }
-      })
+    getResiDetail() {
+      this.$http
+        .get(`/actual/base/residentIntegratedInfo/detail/masked/${this.resiId}`)
+        .then((res) => {
+          if (res.data.code == 0) {
+            this.form = {};
+            this.form.resideInfoDtos = res.data.data.resideInfoDtos;
+            const promises = [];
+            this.$refs["resiExpand"].formList = [];
+            for (let i in this.form.resideInfoDtos) {
+              promises.push(this.getValiheList(i));
+              promises.push(this.getBuildList(i));
+              promises.push(this.getHouseList(i));
+              promises.push(this.getUniList(i));
+              this.form.resideInfoDtos[i].orgOptions = [];
+              this.getOrgTreeList(this.form.resideInfoDtos[i].agencyId, i);
+            }
+            this.form = { ...res.data.data };
+            this.form.baseInfoDto.idNum = this.$route.params.idNum;
+            this.form.baseInfoDto.mobile = this.$route.params.mobile;
+            this.form.baseInfoDto.name = this.$route.params.name;
+            if (!res.data.data.familyInfoDto) {
+              this.form.familyInfoDto = {
+                marriage: null, //婚姻状况
+                spouseSituation: null, //配偶情况
+                elderlyFlag: null, //有无赡养人
+                elderlyRelation: null, //与赡养人关系
+                dependantMobile: null, //赡养人联系电话
+              };
+            }
+            if (!res.data.data.religionDto) {
+              this.form.religionDto = {
+                religion: null, //宗教信仰
+              };
+            }
+            if (!res.data.data.workInfoDto) {
+              this.form.workInfoDto = {
+                careerStatus: null, //就业状况
+                workUnit: null, //工作单位
+                occupation: null, //职业
+              };
+            }
+            if (!res.data.data.eduInfoDto) {
+              this.form.eduInfoDto = {
+                cultureLevel: null,
+              };
+            }
+            if (!res.data.data.specialDto) {
+              this.form.specialDto = {
+                specialCategoryCodes: [],
+              };
+            }
+            if (!res.data.data.subsistenceAllowanceDto) {
+              this.form.subsistenceAllowanceDto = {
+                reasons: [],
+                category: null,
+              };
+            }
+            if (!res.data.data.unemployedDto) {
+              this.form.unemployedDto = {
+                originWorkUnit: null, //原工作单位
+                unemploymentTime: null, //失业时间yyyy-MM-dd
+                unemploymentNum: null, //失业证号
+                employmentNum: null, //再就业优惠证号
+                specialSkill: null, //技术特长
+                unempCompensationFlag: null, //是否领取失业补助金
+                unemploymentReason: null, //失业原因【字典表】code
+                employmentHardFlag: null, //是否就业困难对象；1是0不是
+                employmentWish: null, //劳动能力就业愿望
+              };
+            }
+            if (!res.data.data.oldPeopleDto) {
+              this.form.oldPeopleDto = {
+                    oldPeopleCategories: [],
+                    resideSituation: null,
+                    oldSubsidy: null
+                };
+            }
+            for (const key in this.form.baseInfoDto.categoryInfo) {
+              if (
+                (this.form.baseInfoDto.categoryInfo[key] === 1 &&
+                  this.incidence[key]) ||
+                (this.form.baseInfoDto.categoryInfo.partyFlag == 1 &&
+                  key === "partyFlag")
+              ) {
+                const formId = key === "partyFlag" ? "parymemberInfoDto" : key;
+                this.loadExpand({ index: key, value: formId }, true);
+                for (let i in this.footerInputList) {
+                  const incidenceFormId = this.incidence[formId].formId;
+                  if (this.footerInputList[i].id === incidenceFormId) {
+                    for (let index in this.footerInputList[i].children) {
+                      const formName =
+                        this.footerInputList[i].children[index].formName;
+                      const formData = this.form[incidenceFormId];
+                      if (
+                        formData &&
+                        Object.keys(formData).includes(formName)
+                      ) {
+                        if (
+                          this.footerInputList[i].children[index].itemType ==
+                          "cascader1"
+                        ) {
+                          this.footerInputList[i].children[index].orgPath =
+                            formData.partyOrgIdPath || null;
+                        }
+                        this.footerInputList[i].children[index].value =
+                          formData[formName] != null
+                            ? formData[formName]
+                            : null;
+                        this.footerInputList[i].children[index].id =
+                          formData.id;
+                      }
+                    }
+                  }
+                }
+              }
+            }
+            this.workInfoDtoId = this.form.workInfoDto.id;
+            this.loading = false;
+            return Promise.all(promises);
+          } else if (res.data.code >= 8000) {
+            this.$message.error(res.data.msg);
+            this.loading = false;
+          }
+        })
+        .then(() => {})
+        .catch((err) => {
+          console.log(err);
+        });
     },
-    // 监听基础form
-    handleChangeForm (val) {
-      if (this.fixed) {
-        for (let n in this.fixedForm) {
-          if (n === val) {
-            this.$set(this.fixedList, val, this.form[val])
+    async getDicts() {
+      try {
+        const requests = [
+          this.$http.post("sys/dict/data/dictlist", {
+            dictType: "nationality",
+          }),
+          this.$http.post("sys/dict/data/nation", {
+            formCode: "resi_base_info",
+          }),
+          this.$http.post("sys/dict/data/education", {
+            formCode: "resi_base_info",
+          }),
+          this.$http.post("sys/dict/data/dictlist", {
+            dictType: "marriage",
+          }),
+          this.$http.post("sys/dict/data/dictlist", {
+            dictType: "household_situation",
+          }),
+          this.$http.post("sys/dict/data/relationship", {
+            formCode: "resi_base_info",
+          }),
+          this.$http.post("sys/dict/data/dictlist", {
+            dictType: "career_status",
+          }),
+          this.$http.post("sys/dict/data/dictlist", {
+            dictType: "spouse_situation",
+          }),
+          this.$http.post("sys/dict/data/dictlist", {
+            dictType: "unemployment_reason",
+          }),
+          this.$http.post("sys/dict/data/dictlist", {
+            dictType: "career_goals",
+          }),
+        ];
+        const dictKeys = [
+          "nationalityList",
+          "nationList",
+          "educationList",
+          "marriageList",
+          "householdSituationList",
+          "houseHolderRelList",
+          "careerStatusList",
+          "spouseSituationList",
+          "unemploymentReasonList",
+          "employmentWishList",
+        ]; // 对应的键名
+
+        const results = await Promise.all(requests);
+        results.forEach((result, index) => {
+          if (result.data.code === 0) {
+            this.dicts[dictKeys[index]].push(...result.data.data);
+          } else {
+            console.log(`获取${dictKeys[index]}失败: ${result.data.msg}`);
           }
-        }
+        });
+      } catch (error) {
+        console.log("获取字典失败: ", error);
       }
-      this.tempFormList.forEach(item => {
-        if (item.columnName === val) item.isChange = true
-      })
-    },
-    handleChange () {
-      // this.handleForm()
-    },
-    handleChangeGrid (val) {
-      console.log('val', val)
-      this.form.VILLAGE_ID = ''
-      this.form.BUILD_ID = ''
-      this.form.UNIT_ID = ''
-      this.form.HOME_ID = ''
-      this.getValiheList()
-      this.getBuildList()
-      this.getUniList()
-      this.getHouseList()
-    },
-    handleChangeV (val) {
-      console.log('val', val)
-      this.form.BUILD_ID = ''
-      this.form.UNIT_ID = ''
-      this.form.HOME_ID = ''
-      this.getBuildList()
-      this.getUniList()
-      this.getHouseList()
-    },
-    handleChangeB (val) {
-      console.log('val', val)
-      this.form.UNIT_ID = ''
-      this.form.HOME_ID = ''
-      this.getUniList()
-      this.getHouseList()
-    },
-    handleChangeD () {
-      this.form.HOME_ID = ''
-      this.getHouseList()
-    },
-    // 为了实现根据房屋类型改版是否租户的需求
-    handleChangeH (val) {
-      let item = this.optionsH.find(item => item.value === val);
-      if (item && item.type == '1') {
-        this.form.IS_TENANT = '1'
-        console.log('item-----', item)
-      } else this.form.IS_TENANT = '0'
-    },
-    handlerMuscForm () {
-      let arr = []
-      this.addList.forEach(item => {
-        // console.log('handlerMuscForm----000', this.$refs['baseForms' + item.row || item][0].handleForm())
-        arr.push([...this.$refs['baseForms' + item.row][0].handleForm()])
-      })
-      if (arr.length === 0) return arr
-      let arr2 = arr.reduce(function (a, b) { return a.concat(b) })
-      let hash = {}
-      let i = 0
-      let res = []
-      // let finalArr = []
-      arr2.forEach((item) => {
-        let name = item.tableName
-        if (hash[name]) {
-          res[hash[name] - 1].list.push(...item.list)
-        } else {
-          hash[name] = ++i
-          res.push({
-            list: [...item.list],
-            supportAdd: this.supportAdd,
-            tableName: name
-          })
-        }
-      })
-      return res
-    },
-    resetForm () {
-      this.$refs[this.formId].resetFields()
-    },
-    handleForm () {
-      let newForm = []
-      this.$refs[this.formId].validate((valid) => {
-        if (valid) {
-          var hash = {}
-          var i = 0
-          var res = []
-          let ID = this.tempFormList[0].ID
-          this.tempFormList.forEach(function (item) {
-            var name = item.tableName
-            hash[name] ? res[hash[name] - 1].list.push(item) : hash[name] = ++i && res.push({
-              list: [item],
-              ID: item.ID,
-              tableName: name
-            })
-          })
-          // console.log('resssssss', res)
-          const itemTypes = ['cascader', 'daterange', 'timerange']
-          res.forEach(item => {
-            let _form = {}
-            item.list.filter(n => n.isChange).forEach(r => {
-              _form[r.columnName] = r.multiSelect || itemTypes.includes(r.itemType) ? this.form[r.columnName].toString() : this.form[r.columnName]
-              if (r.ID) {
-                _form.ID = r.ID
-              }
-              // return _form
-            })
-            if (this.fixed) {
-              for (let n in this.fixedList) {
-                _form[n] = this.fixedList[n]
-              }
-              if (Object.keys(_form).length > 0) {
-                if (!_form.AGENCY_ID) _form.AGENCY_ID = this.agencyId
-              }
-              if (!_form.ID) _form.ID = ID
-            }
-            console.log('objeckeyssss', Object.keys(_form), _form)
-            newForm.push({
-              tableName: item.tableName,
-              supportAdd: this.supportAdd,
-              ID: item.ID,
-              list: Object.keys(_form).length > 0 ? [{ ..._form }] : []
-            })
-          })
-          console.log('newFormhhhhh', newForm)
-          return newForm
-        } else {
-          console.log('error submit!!')
-          return false
-        }
-      })
-      if (this.supportAdd) newForm = this.handlerMuscForm()
-      return newForm
     },
-    async getOptionsLists (url) {
-      let options = []
-      // console.log('getOptionsList----', url)
-      await this.$http
-        .post(url, { formCode: 'resi_base_info' })
+    getOrgTreeList(id, i) {
+      this.$http
+        .post("/gov/org/customeragency/rootagencygridtree", { agencyId: id })
         .then(({ data: res }) => {
           if (res.code !== 0) {
-            return this.$message.error(res.msg)
+            return this.$message.error(res.msg);
           } else {
-            options = res.data
+            this.form.resideInfoDtos[i].orgOptions.push(res.data);
           }
         })
-        .catch(() => {
-          return this.$message.error('网络错误')
-        })
-      return options
+        .catch((err) => {
+          console.log(err);
+          return this.$message.error("网络错误");
+        });
     },
-    getGridList () {
-      const { user } = this.$store.state
-      let purpose = 'query'
-      if (this.disabled) purpose = 'query'
-      else purpose = 'addorupdate'
+    getOrgTreeListAll() {
       this.$http
-        .post('/gov/org/customergrid/gridoption', { agencyId: this.agencyId, purpose })
+        .post("/gov/org/customeragency/agencygridtree", {})
         .then(({ data: res }) => {
           if (res.code !== 0) {
-            return this.$message.error(res.msg)
+            return this.$message.error(res.msg);
           } else {
-            console.log('获取查询详情成功', res.data)
-            this.optionsG = res.data
+            this.orgOption.push(res.data);
           }
         })
         .catch(() => {
-          return this.$message.error('网络错误')
-        })
+          return this.$message.error("网络错误");
+        });
+    },
+    handelChangeResiHouseRel(val, index) {
+      this.form.resideInfoDtos[index].householdSituation =
+        val == 0 ? "rhyz" : "rzhbz";
+    },
+    handleChangeAgency(index) {
+      let obj = this.$refs[`myCascader`][index].getCheckedNodes()[0]
+        ? this.$refs["myCascader"][index].getCheckedNodes()[0].data
+        : null;
+      if (obj) {
+        if (obj.level === "grid") {
+          this.form.resideInfoDtos[index].gridId = obj.agencyId;
+          this.form.resideInfoDtos[index].agencyId = obj.pid;
+
+          this.form.resideInfoDtos[index].villageId = "";
+          this.form.resideInfoDtos[index].buildId = "";
+          this.form.resideInfoDtos[index].unitId = "";
+          this.form.resideInfoDtos[index].homeId = "";
+          this.form.resideInfoDtos[index].optionsV = [];
+          this.form.resideInfoDtos[index].optionsB = [];
+          this.form.resideInfoDtos[index].optionsD = [];
+          this.form.resideInfoDtos[index].optionsH = [];
+          this.getValiheList(index);
+        } else {
+          // this.selGridId = []
+          this.form.resideInfoDtos[index].gridId = "";
+          this.form.resideInfoDtos[index].agencyId = "";
+          this.$message.info("请选择网格");
+          return false;
+        }
+      }
+    },
+    handleChangeV(index) {
+      this.form.resideInfoDtos[index].buildId = "";
+      this.form.resideInfoDtos[index].unitId = "";
+      this.form.resideInfoDtos[index].homeId = "";
+      this.form.resideInfoDtos[index].optionsB = [];
+      this.form.resideInfoDtos[index].optionsD = [];
+      this.form.resideInfoDtos[index].optionsH = [];
+      this.getBuildList(index);
+      this.getUniList(index);
+      this.getHouseList(index);
+    },
+    handleChangeB(index) {
+      this.form.resideInfoDtos[index].unitId = "";
+      this.form.resideInfoDtos[index].homeId = "";
+      this.form.resideInfoDtos[index].optionsD = [];
+      this.form.resideInfoDtos[index].optionsH = [];
+      this.getUniList(index);
+      this.getHouseList(index);
     },
-    getValiheList () {
-      const { user } = this.$store.state
+    handleChangeD(index) {
+      this.form.resideInfoDtos[index].homeId = "";
+      this.form.resideInfoDtos[index].optionsH = [];
+      this.getHouseList(index);
+    },
+    handleChangeH(i) {
+      // let item = this.form.resideInfoDtos[i].optionsH.find((item, index) => index === i);
+      // if (item && item.type == '1') {
+      //     // this.form.IS_TENANT = '1'
+      //     console.log('item-----', item)
+      // }
+      // else
+      //  this.form.IS_TENANT = '0'
+    },
+
+    getValiheList(index) {
+      const { user } = this.$store.state;
       this.$http
-        .post('/actual/base/communityQuarters/listQuartersOptions', { gridId: this.form.GRID_ID, agencyId: this.agencyId })
+        .post("/actual/base/communityQuarters/listQuartersOptions", {
+          gridId: this.form.resideInfoDtos[index].gridId,
+          agencyId: this.form.resideInfoDtos[index].agencyId || user.agencyId,
+        })
         .then(({ data: res }) => {
           if (res.code !== 0) {
-            return this.$message.error(res.msg)
+            return this.$message.error(res.msg);
           } else {
-            console.log('获取查询详情成功', res.data)
-            this.optionsV = res.data
+            // this.form.resideInfoDtos[index].optionsV.push(...res.data)
+            this.$set(this.form.resideInfoDtos[index], "optionsV", res.data);
           }
         })
-        .catch(() => {
-          return this.$message.error('网络错误')
-        })
+        .catch((err) => {
+          console.log(err);
+          return this.$message.error("网络错误");
+        });
     },
-    getBuildList () {
+    getBuildList(index) {
       this.$http
-        .post('/actual/base/communityBuilding/buildingoption', { quartersId: this.form.VILLAGE_ID })
+        .post("/actual/base/communityBuilding/buildingoption", {
+          quartersId: this.form.resideInfoDtos[index].villageId,
+        })
         .then(({ data: res }) => {
           if (res.code !== 0) {
-            return this.$message.error(res.msg)
+            return this.$message.error(res.msg);
           } else {
-            console.log('获取查询详情成功', res.data)
-            this.optionsB = res.data
+            this.$set(this.form.resideInfoDtos[index], "optionsB", res.data);
           }
         })
         .catch(() => {
-          return this.$message.error('网络错误')
-        })
+          return this.$message.error("网络错误");
+        });
     },
-    getUniList () {
+    getUniList(index) {
       this.$http
-        .post('/actual/base/communityBuildingUnit/unitoption', { buildingId: this.form.BUILD_ID })
+        .post("/actual/base/communityBuildingUnit/unitoption", {
+          buildingId: this.form.resideInfoDtos[index].buildId,
+        })
         .then(({ data: res }) => {
           if (res.code !== 0) {
-            return this.$message.error(res.msg)
+            return this.$message.error(res.msg);
           } else {
-            console.log('获取查询详情成功', res.data)
-            this.optionsD = res.data
+            this.$set(this.form.resideInfoDtos[index], "optionsD", res.data);
           }
         })
         .catch(() => {
-          return this.$message.error('网络错误')
-        })
+          return this.$message.error("网络错误");
+        });
     },
-    getHouseList () {
+    getHouseList(index) {
       this.$http
-        .post('/actual/base/communityHouse/houseoption', { unitId: this.form.UNIT_ID })
+        .post("/actual/base/communityHouse/houseoption", {
+          unitId: this.form.resideInfoDtos[index].unitId,
+        })
         .then(({ data: res }) => {
           if (res.code !== 0) {
-            return this.$message.error(res.msg)
+            return this.$message.error(res.msg);
           } else {
-            console.log('获取查询详情成功', res.data)
-            this.optionsH = res.data
+            this.$set(this.form.resideInfoDtos[index], "optionsH", res.data);
           }
         })
         .catch(() => {
-          return this.$message.error('网络错误')
-        })
-    }
-  }
-}
-</script>
+          return this.$message.error("网络错误");
+        });
+    },
+    handelClickAddHouse() {
+      this.form.resideInfoDtos.push({
+        agencyName: this.$store.state.user.agencyName,
+        agencyId: this.$store.state.user.agencyId,
+        gridId: null, //所属网格id
+        villageId: null, //小区id
+        buildId: null, //楼栋id
+        unitId: null, //单元id
+        moveOutFlag: null,
+        outOfTime: null, //迁出时间
+        homeId: null, //房屋id
+        placeOfDomicile: null, //户籍所在地
+        currentResidence: null, //现居住地
+        householdSituation: null, //人户状况
+        houseHolderRel: null, //与户主关系
+        resiHouseRel: null, //人房关系
+        optionsV: [],
+        optionsB: [],
+        optionsH: [],
+        optionsD: [],
+        orgOptions: this.orgOption,
+      });
+    },
+    handelClickDelHouse(i) {
+      this.form.resideInfoDtos = this.form.resideInfoDtos.filter(
+        (item, index) => index != i
+      );
+    },
+    handleValidBlur() {
+      if (this.form.baseInfoDto.idType != 1) return;
+      if (
+        !isCard(this.form.baseInfoDto.idNum) &&
+        !isPassport(this.form.baseInfoDto.idNum)
+      )
+        return;
+      const { user } = this.$store.state;
+      let huji = "",
+        i = 0;
+      if (user.areaCodePath && user.areaCodePath.length > 0) {
+        i = user.areaCodePath.length - 1;
+        huji =
+          user.areaCodePath[i].length > 6
+            ? user.areaCodePath[i].substr(0, 6)
+            : user.areaCodePath[i];
+      }
 
-<style lang="scss" scoped>
-.resi-form {
-  :deep .el-date-editor.el-input,
-  .el-date-editor.el-input__inner {
-    width: 100% !important;
-  }
-}
-.resi-cell-value .resi-cell-input {
-  width: 168px;
-}
-</style>
-<style lang="scss" scoped>
-.resi-form .resi-row {
-  margin-bottom: 0;
-}
+      if (
+        this.form.baseInfoDto.idNum.length === 18 ||
+        this.form.baseInfoDto.idNum.length === 15
+      ) {
+        const _id = this.form.baseInfoDto.idNum.substr(0, 6);
+        const { sex, birth, age } = computedCard(this.form.baseInfoDto.idNum);
+        this.form.baseInfoDto.birthday = birth;
+        this.form.baseInfoDto.gender = sex == 1 ? "1" : "2";
+        this.form.baseInfoDto.categoryInfo.oldPeopleFlag = age >= 60 ? 1 : 0;
+        // this.form.IS_BDHJ = huji == _id ? '1' : ''
+        // 身份证前端验证角色方法 因原型没有注释
+        // this.validateIdcard(this.form.idNum)
+      }
+    },
+    handleLocalRadio(e, value) {
+      if (e.target.type === "radio") return;
+      this.form.baseInfoDto.localResidenceFlag =
+      this.form.baseInfoDto.localResidenceFlag === value ? 0 : 1;
+    },
+    handelClickMarriage() {
+      this.form.familyInfoDto.spouseSituation = null;
+      // console.log(this.form.familyInfoDto,'更改婚姻情况');
+    },
+    handelClickelderly() {
+      this.form.familyInfoDto.elderlyRelation = null;
+      this.form.familyInfoDto.dependantMobile = null;
+    },
+    handelClickCareerStatus(val) {
+      this.form.workInfoDto = {
+        careerStatus: val, //就业状况
+        workUnit: null, //工作单位
+        occupation: null, //职业
+        id: this.workInfoDtoId || null,
+      };
+      if (!this.workInfoDtoId) {
+        delete this.form.workInfoDto.id;
+      }
+      console.log(this.form.workInfoDto);
+      if (val == 0) {
+        this.form.baseInfoDto.categoryInfo.unemployedFlag = 1;
+        this.form.unemployedDto = {
+          originWorkUnit: null, //原工作单位
+          unemploymentTime: null, //失业时间yyyy-MM-dd
+          unemploymentNum: null, //失业证号
+          employmentNum: null, //再就业优惠证号
+          specialSkill: null, //技术特长
+          unempCompensationFlag: null, //是否领取失业补助金
+          unemploymentReason: null, //失业原因【字典表】code
+          employmentHardFlag: null, //是否就业困难对象；1是0不是
+          employmentWish: null, //劳动能力就业愿望
+        };
+      } else {
+        this.form.unemployedDto = null;
+        this.form.baseInfoDto.categoryInfo.unemployedFlag = 0;
+      }
+    },
+    handlerCancle() {
+      this.$store.state.contentTabs = this.$store.state.contentTabs.filter(
+        (item) => item.name !== "edit-resi"
+      );
+      let tab =
+        this.$store.state.contentTabs[this.$store.state.contentTabs.length - 1];
+      this.$router.push({
+        name: tab.name,
+        params: { ...tab.params },
+        query: { ...tab.query },
+      });
+    },
+    handleClickSubmit(house) {
+      this.$refs["editForm"].validate((valid) => {
+        if (valid) {
+          this.form.resideInfoDtos.forEach((item) => {
+            delete item.optionsV;
+            delete item.optionsB;
+            delete item.optionsH;
+            delete item.optionsD;
+            delete item.orgOptions;
+          });
+          delete this.form.integrityData;
+          this.submitForm(house);
+        }
+      });
+    },
+    async submitForm(house) {
+      this.btnLoading = true;
+      try {
+        let url = this.houseType
+          ? "/actual/base/residentBaseInfo/update"
+          : "/actual/base/residentBaseInfo/save";
+        let parm = {
+          ...this.form,
+        };
+        let { code, data, msg } = await requestPost(url, parm);
+        if (code == 0) {
+          if (house != "house") {
+            this.$message.success("保存成功");
+            this.$refs["editForm"].resetFields();
+            this.handlerCancle();
+          } else {
+            this.$message.success("保存成功");
+            let homeArr = JSON.parse(JSON.stringify(this.form.resideInfoDtos));
+            this.$refs["editForm"].resetFields();
+            this.form = this.formCopy;
+            this.form.resideInfoDtos = homeArr;
+            for (let key in this.form.baseInfoDto.categoryInfo) {
+              if (this.form.baseInfoDto.categoryInfo[key] === 1) {
+                this.form.baseInfoDto.categoryInfo[key] = 0;
+              }
+            }
+            this.$refs["resiExpand"].formList = [];
+            this.footerInputList.forEach((item) => {
+              item.children.forEach((child) => {
+                child.value = child.itemType === "checkbox" ? [] : null;
+              });
+            });
+            this.houseType = false;
+          }
+        } else if (code >= 8000) {
+          this.$message.error(msg);
+        }
+        this.btnLoading = false;
+      } catch (error) {
+        this.$message.error(msg);
+        this.btnLoading = false;
+      }
+    },
 
-// .resi-form .resi-cell {
-//   display: flex;
-//   align-items: center;
-// .resi-cell-label {
-//   width: 70px;
-//   box-sizing: border-box;
-//   margin-right: 15px;
-//   text-align: right;
-// }
-// .resi-cell-value-radio {
-//   display: flex;
-//   align-items: center;
-//   min-height: 36px;
-// }
-//  .resi-cell-value .resi-cell-input {
-//   width: 180px;
-// }
+    loadExpand({ index, value }, event,) {
+      // 设置 partyFlag
+      if (value === 1 || value === 0 || value === 2) {
+        this.form.baseInfoDto.categoryInfo.partyFlag = value;
+        value = value === 1 ? "parymemberInfoDto" : value;
+        if (value === 0 || value === 2) {
+          this.form.parymemberInfoDto = null;
+          this.footerInputList.forEach((item) => {
+            if (item.id === "parymemberInfoDto") {
+              item.children.forEach((child) => {
+                child.value = child.itemType === "checkbox" ? [] : null;
+              });
+            }
+          });
+
+          this.$nextTick(() => {
+            this.$refs["resiExpand"].formList = this.$refs[
+              "resiExpand"
+            ].formList.filter((item) => item.formId !== "parymemberInfoDto");
+          });
+        }
+      }
+
+      // 设置特殊处理逻辑
+      if (index !== 3 && index) {
+        this.form.baseInfoDto.categoryInfo[value] = event ? 1 : 0;
+      } else if (index === 3) {
+        if (event) {
+          this.form.baseInfoDto.categoryInfo.specialCrowdFlag = 1;
+          this.form.specialDto.specialCategoryCodes.push(value);
+        } else {
+          this.form.specialDto.specialCategoryCodes =
+            this.form.specialDto.specialCategoryCodes.filter(
+              (item) => item !== value
+            );
+        }
+      }
+      // 处理 incidence
+      if (this.incidence[value]) {
+        if (event) {
+          this.$nextTick(() => {
+            this.$refs["resiExpand"].formList.push({
+              form: [
+                this.footerInputList.find(
+                  (item) => item.id === this.incidence[value].formId
+                ),
+              ],
+              title: this.incidence[value].title,
+              formId: this.incidence[value].formId,
+            });
+            this.$refs["resiExpand"].formType = this.incidence[value].formType;
+            this.$refs["resiExpand"].showForm();
+          });
+        } else {
+          this.$refs["resiExpand"].formList = this.$refs[
+            "resiExpand"
+          ].formList.filter(
+            (item) => item.formId !== this.incidence[value].formId
+          );
+
+          this.footerInputList.forEach((item) => {
+            if (item.id === this.incidence[value].formId) {
+              item.children.forEach((child) => {
+                child.value = child.itemType === "checkbox" ? [] : null;
+              });
+            }
+          });
+          delete this.form[this.incidence[value].formType];
+        }
+      }
+    },
+    showDialog({ index, value }, event) {
+            if (value === 1) {
+                value = 'parymemberInfoDto'
+                this.form.baseInfoDto.categoryInfo.partyFlag = 1;
+            } else if (value === 0) {
+                value = 'parymemberInfoDto'
+                this.form.baseInfoDto.categoryInfo.partyFlag = 0;
+            } else if (value === 2) {
+                value = 'parymemberInfoDto'
+                this.form.baseInfoDto.categoryInfo.partyFlag = 2;
+            }
+            if (index != 3 && index) {
+                this.form.baseInfoDto.categoryInfo[value] = event ? 1 : 0;
+
+            } else if (index == 3) {
+                if (event) {
+                    this.form.baseInfoDto.categoryInfo.specialCrowdFlag = 1;
+                    if (value == 'unitedFrontFlag' || value == 'petitionOfficerFlag') {
+                        this.form.baseInfoDto.categoryInfo[value] = 1
+                    }
+                    this.form.specialDto.specialCategoryCodes.push(value);
+                } else {
+                    this.form.specialDto.specialCategoryCodes = this.form.specialDto.specialCategoryCodes.filter(item => item != value);
+                    if (value == 'unitedFrontFlag' || value == 'petitionOfficerFlag') {
+                        this.form.baseInfoDto.categoryInfo[value] = 0
+                    }
+                }
+            }
+            const map = {
+                'parymemberInfoDto': { formId: 'parymemberInfoDto', formType: 'parymemberInfoDto', title: '党员信息' },
+                'disabilityFlag': { formId: 'healthDto', formType: 'healthDto', title: '残疾信息' },
+                'seriousIllnessFlag': { formId: 'seriousIllnessDto', formType: 'seriousIllnessDto', title: '大病信息' },
+                'chronicDiseaseFlag': { formId: 'chronicDiseaseDto', formType: 'chronicDiseaseDto', title: '慢病信息' },
+                'deathFlag': { formId: 'deathDto', formType: 'deathDto', title: '死亡' },
+                'oldPeopleFlag': { formId: 'oldPeopleDto', formType: 'oldPeopleDto', title: '老年人信息' },
+                'subsistenceAllowanceFlag': { formId: 'subsistenceAllowanceDto', formType: 'subsistenceAllowanceDto', title: '低保人员信息' },
+                'veteranFlag': { formId: 'veteranDto', formType: 'veteranDto', title: '退役军人信息' },
+                'ensureHouseFlag': { formId: 'ensureHouseDto', formType: 'ensureHouseDto', title: '保障性住房信息' },
+                'specialSupportFlag': { formId: 'specialSupportDto', formType: 'specialSupportDto', title: '特扶人员' },
+                'unitedFrontFlag': { formId: 'unitedFrontDto', formType: 'unitedFrontDto', title: '统战人员' },
+                'volunteerFlag': { formId: 'volunteerDto', formType: 'volunteerDto', title: '志愿者' },
+            };
+      if (map[value] && event == true) {
+        this.dialogTitle = map[value].title;
+        this.dialogVisible = (event == true || value == "parymemberInfoDto") && this.dialogTitle != "";
+          this.$nextTick(() => {
+            this.$refs["addExpand"].formList = [
+              this.footerInputList.find((item) => item.id === map[value].formId),
+            ];
+            this.$refs["addExpand"].formType = map[value].formType;
+            this.$refs["addExpand"].showForm();
+          });
+      }else{
+        this.$refs["resiExpand"].formList = this.$refs[
+            "resiExpand"
+          ].formList.filter(
+            (item) => item.formId !== this.incidence[value].formId
+          );
+
+          this.footerInputList.forEach((item) => {
+            if (item.id === this.incidence[value].formId) {
+              item.children.forEach((child) => {
+                child.value = child.itemType === "checkbox" ? [] : null;
+              });
+            }
+          });
+          delete this.form[this.incidence[value].formType];
+      }
+    },
+    submitExpandAdd(form, formType) {
+      this.form[formType] = form[formType];
+      this.dialogVisible = false;
+    },
+    hideExpand(formType) {
+      delete this.form[formType];
+      this.dialogVisible = false;
+    },
+    // 提交扩展信息
+    submitExpand(_form, { changId, changPid, changType }) {
+      if (changType == "checkbox") {
+        this.form[changPid][changId] = [];
+        this.form[changPid][changId].push(..._form[changPid][changId]);
+      } else {
+        if (!this.form[changPid]) {
+          this.$set(this.form, changPid, {});
+        }
+        if (changPid) {
+          this.$set(this.form[changPid], changId, _form[changPid][changId]);
+        }
+      }
+      for (let i in this.footerInputList) {
+        if (this.footerInputList[i].id === changPid) {
+          for (let index in this.footerInputList[i].children) {
+            const formName = this.footerInputList[i].children[index].formName;
+            const formData = this.form[changPid];
+            if (formData && Object.keys(formData).includes(formName)) {
+              this.footerInputList[i].children[index].value =
+                formData[formName] || null;
+            }
+          }
+        }
+      }
+    },
+  },
+  components: { stafftag, resiExpand ,addExpand},
+  computed: {},
+  watch: {},
+};
+</script>
 
-.resi-cell-value .resi-cell-textarea {
-  width: 300px;
-}
-.resi-cell-col {
-  display: flex;
-  .el-form-item {
-    margin-right: 10px;
-  }
-}
-.resi-cell-select {
-  width: 190px;
-  box-sizing: border-box;
-  margin-right: 10px;
-  &-middle {
-    width: 130px;
-  }
-  &-small {
-    width: 88px;
-  }
-}
-.resi-cell-select:last-child {
-  margin-right: 0;
-}
-// }
+<style lang='scss' scoped>
+@import "@/assets/scss/modules/management/form-main.scss";
+@import "@/assets/scss/pages/resiAdd.scss";
 </style>
diff --git a/src/views/components/editResiCopy.vue b/src/views/components/editResiCopy.vue
new file mode 100644
index 000000000..791665279
--- /dev/null
+++ b/src/views/components/editResiCopy.vue
@@ -0,0 +1,950 @@
+<template>
+  <div :id="formId"
+       class="resi-container">
+    <el-form :ref="formId"
+             class="resi-form"
+             :model="form"
+             :rules="rulesForm"
+             :label-width="labelWidth">
+      <template v-if="supportAdd">
+        <el-row style="margin-bottom: 10px;">
+          <el-col :span="24">
+            <el-button icon="el-icon-plus"
+                       size="small"
+                       @click="handleAddRow"></el-button>
+          </el-col>
+        </el-row>
+        <edit-form v-for="(item, index) in addList"
+                   :key="index"
+                   :ref="'baseForms' + index"
+                   :columns="3"
+                   :form-list="item.itemList || formList"
+                   :form-id="'baseForms' + item.row" />
+      </template>
+      <template v-else>
+        <el-row v-if="fixed"
+                class="resi-row">
+          <!-- <el-col v-for="n in item" :key="n.id" :span="n.itemType === 'textarea'&&24 || (24/columns)"> -->
+          <el-col :span="6">
+            <el-form-item prop="GRID_ID"
+                          label="所属网格">
+              <!-- <div class="resi-cell"> -->
+              <!-- <div class="resi-cell-label">{{n.label}}</div> -->
+              <div class="resi-cell-value">
+                <el-select v-model.trim="form.GRID_ID"
+                           :disabled="disabled"
+                           placeholder="请选择网格"
+                           size="small"
+                           clearable
+                           class="resi-cell-select"
+                           @change="handleChangeGrid">
+                  <el-option v-for="item in optionsG"
+                             :key="item.value"
+                             :label="item.label"
+                             :value="item.value">
+                  </el-option>
+                </el-select>
+              </div>
+              <!-- </div> -->
+            </el-form-item>
+          </el-col>
+          <el-col :span="18">
+            <el-form-item label="所属房屋"
+                          required>
+              <div class="resi-cell-value">
+                <div class="resi-cell-col">
+                  <el-form-item prop="VILLAGE_ID">
+                    <el-select v-model.trim="form.VILLAGE_ID"
+                               placeholder="请选择小区"
+                               size="small"
+                               clearable
+                               class="resi-cell-select"
+                               :disabled="disabled"
+                               @change="handleChangeV">
+                      <el-option v-for="item in optionsV"
+                                 :key="item.value"
+                                 :label="item.label"
+                                 :value="item.value">
+                      </el-option>
+                    </el-select>
+                  </el-form-item>
+                  <el-form-item prop="BUILD_ID">
+                    <el-select v-model.trim="form.BUILD_ID"
+                               placeholder="请选择楼号"
+                               size="small"
+                               clearable
+                               :disabled="disabled"
+                               class="resi-cell-select resi-cell-select-middle"
+                               @change="handleChangeB">
+                      <el-option v-for="item in optionsB"
+                                 :key="item.value"
+                                 :label="item.label"
+                                 :value="item.value">
+                      </el-option>
+                    </el-select>
+                  </el-form-item>
+                  <el-form-item prop="UNIT_ID">
+                    <el-select v-model.trim="form.UNIT_ID"
+                               placeholder="请选择单元"
+                               size="small"
+                               clearable
+                               :disabled="disabled"
+                               class="resi-cell-select resi-cell-select-middle"
+                               @change="handleChangeD">
+                      <el-option v-for="item in optionsD"
+                                 :key="item.value"
+                                 :label="item.label"
+                                 :value="item.value">
+                      </el-option>
+                    </el-select>
+                  </el-form-item>
+                  <el-form-item prop="HOME_ID">
+                    <el-select v-model.trim="form.HOME_ID"
+                               placeholder="请选择房号"
+                               size="small"
+                               clearable
+                               :disabled="disabled"
+                               class="resi-cell-select resi-cell-select-middle"
+                               @change="handleChangeH">
+                      <el-option v-for="item in optionsH"
+                                 :key="item.value"
+                                 :label="item.label"
+                                 :value="item.value">
+                      </el-option>
+                    </el-select>
+                  </el-form-item>
+                </div>
+                <!-- <el-col :span="6">
+
+                  </el-col>
+                  <el-col :span="6">
+
+                  </el-col>
+                  <el-col :span="6">
+
+                  </el-col>
+                  <el-col :span="6">
+
+                  </el-col> -->
+              </div>
+            </el-form-item>
+          </el-col>
+          <!-- <el-col :span="6">
+              <el-form-item :prop="form.BUILD_ID" label="所属楼宇">
+                <div class="resi-cell-value">
+                  <el-select v-model.trim="form.BUILD_ID" :disabled="disabled" placeholder="请选择楼号" size="small"
+                  clearable class="resi-cell-select"
+                  >
+                    <el-option
+                      v-for="item in optionsB"
+                      :key="item.value"
+                      :label="item.label"
+                      :value="item.value">
+                    </el-option>
+                  </el-select>
+                </div>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+              <el-form-item :prop="form.HOME_ID" label="所属家庭">
+                <div class="resi-cell-value">
+                  <el-select v-model.trim="form.HOME_ID" :disabled="disabled" placeholder="请选择" size="small"
+                  clearable class="resi-cell-select"
+                  >
+                    <el-option
+                      v-for="item in optionsH"
+                      :key="item.value"
+                      :label="item.label"
+                      :value="item.value">
+                    </el-option>
+                  </el-select>
+                </div>
+            </el-form-item>
+          </el-col> -->
+        </el-row>
+        <el-row v-for="(item, index) in sliceList(formList, columns)"
+                :key="index"
+                class="resi-row" :class="{'width-40':index==3||index==2||index==4||index==5}">
+          <!-- <el-col v-for="n in item" :key="n.id" :span="n.itemType === 'textarea'&&24 || (24/columns)"> -->
+          <el-col v-for="n in item"
+                  :key="n.itemId"
+                  :span="item.length === 1 ? 24 : (24/columns) "
+                  :style="n.itemType === 'divider' && 'display: none;'">
+            <el-form-item :prop="n.columnName"
+                          :label="n.itemType != 'radio'?n.label:''">
+              <!-- <div class="resi-cell"> -->
+              <!-- <div class="resi-cell-label">{{n.label}}</div> -->
+              <div class="resi-cell-value">
+
+                <template v-if="n.itemType === 'input' || n.itemType === 'textarea'">
+                  <!-- <span v-if="n.columnName==='MOBILE'||n.columnName==='ID_CARD'">{{ form[n.columnName]||'--'}}</span> -->
+                  <el-input v-if="n.columnName==='MOBILE'||n.columnName==='ID_CARD'"
+                            v-model.trim="form[n.columnName]"
+                            :disabled="disabled"
+                            class="resi-cell-input"
+                            size="small"
+                            clearable
+                            placeholder="请输入内容">
+                  </el-input>
+
+                  <el-input v-else-if="n.validType"
+                            v-model.trim="form[n.columnName]"
+                            :disabled="disabled"
+                            class="resi-cell-input"
+                            size="small"
+                            clearable
+                            placeholder="请输入内容">
+                  </el-input>
+                  <el-input v-else
+                            v-model.trim="form[n.columnName]"
+                            :disabled="disabled"
+                            class="resi-cell-input"
+                            size="small"
+                            clearable
+                            placeholder="请输入内容">
+                  </el-input>
+                </template>
+                <!-- <template v-if="n.itemType === 'textarea'">
+                      <el-input
+                        v-model.trim="form[n.columnName]"
+                        class="resi-cell-textarea"
+                        size="small"
+                        type="textarea"
+                        clearable
+                        placeholder="请输入内容"
+                        >
+                      </el-input>
+                    </template> -->
+                <el-date-picker v-else-if="n.itemType === 'datepicker'"
+                                v-model.trim="form[n.columnName]"
+                                :disabled="disabled"
+                                class="resi-cell-input"
+                                type="date"
+                                size="small"
+                                clearable
+                                placeholder="选择日期"
+                                format="yyyy 年 MM 月 dd 日"
+                                value-format="yyyy-MM-dd">
+                </el-date-picker>
+                <el-date-picker v-else-if="n.itemType === 'daterange'"
+                                v-model.trim="form[n.columnName]"
+                                :disabled="disabled"
+                                type="daterange"
+                                align="right"
+                                unlink-panels
+                                value-format="yyyy-MM-dd"
+                                range-separator="至"
+                                start-placeholder="开始日期"
+                                end-placeholder="结束日期">
+                </el-date-picker>
+                <el-time-picker v-else-if="n.itemType === 'timepicker'"
+                                v-model.trim="form[n.columnName]"
+                                :disabled="disabled"
+                                placeholder="任意时间点">
+                </el-time-picker>
+                <el-time-picker v-else-if="n.itemType === 'timerange'"
+                                v-model.trim="form[n.columnName]"
+                                :disabled="disabled"
+                                is-range
+                                range-separator="至"
+                                start-placeholder="开始时间"
+                                end-placeholder="结束时间"
+                                placeholder="选择时间范围">
+                </el-time-picker>
+                <el-select v-else-if="n.itemType === 'select'"
+                           v-model.trim="form[n.columnName]"
+                           :multiple="n.multiSelect"
+                           :disabled="disabled"
+                           placeholder="请选择"
+                           size="small"
+                           clearable
+                           class="resi-cell-select">
+                  <el-option v-for="item in n.options || options"
+                             :key="item.value"
+                             :label="item.label"
+                             :value="item.value">
+                  </el-option>
+                </el-select>
+                <!-- <el-cascader
+                      :options="options"
+                      :props="{ checkStrictly: true }"
+                      clearable></el-cascader> -->
+                <el-cascader v-else-if="n.itemType === 'cascader'"
+                             v-model.trim="form[n.columnName]"
+                             :options="n.options"
+                             :disabled="disabled"
+                             :props="{ emitPath: false }"
+                             clearable
+                             size="small"
+                             class="resi-cell-select">
+                </el-cascader>
+                <template v-else-if="n.itemType === 'radio'">
+                  <!-- <el-radio v-for="ns in n.options"
+                            :key="ns.value"
+                            v-model.trim="form[n.columnName]"
+                            :disabled="disabled"
+                            :label="ns.value">
+                    {{ ns.label }}
+                  </el-radio> -->
+                  <el-checkbox-group v-model.trim="form[n.columnName]">
+                    <el-checkbox 
+                                 :key="n.value"
+                                 :label="n.value"
+                                 :disabled="disabled">{{n.label}}</el-checkbox>
+                    <!-- <el-checkbox label="n.la"></el-checkbox> -->
+                  </el-checkbox-group>
+                  <!-- <el-radio v-model.trim="form[n.columnName]" label="1">备选项</el-radio> -->
+                </template>
+                <template v-else-if="n.itemType === 'checkbox'">
+                  <el-checkbox-group v-model.trim="form[n.columnName]">
+                    <el-checkbox v-for="ns in n.options"
+                                 :key="ns.value"
+                                 :label="ns.value"
+                                 :disabled="disabled">{{ns.label}}</el-checkbox>
+                    <!-- <el-checkbox label="n.la"></el-checkbox> -->
+                  </el-checkbox-group>
+                </template>
+              </div>
+              <!-- </div> -->
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </template>
+    </el-form>
+  </div>
+</template>
+
+<script>
+import { isCard, isMobile, isPhone } from '@/utils/validate'
+import { requestPost } from "@/js/dai/request";
+
+
+export default {
+  name: 'editForm',
+  props: {
+    editUserId: {
+      type: String,
+      default: ''
+    },
+    fixed: {
+      type: Boolean,
+      default: false
+    },
+    labelWidth: {
+      type: String,
+      default: '100px'
+    },
+    formId: {
+      type: String,
+      default: 'resiForm'
+    },
+    agencyId: {
+      type: String,
+      default: ''
+    },
+    formList: {
+      type: Array,
+      default: function () {
+        return []
+      }
+    },
+    formInfo: {
+      type: Object,
+      default: function () {
+        return {}
+      }
+    },
+    mutiList: {
+      type: Array,
+      default: function () {
+        return []
+      }
+    },
+    // 渲染一行几列
+    columns: {
+      type: Number,
+      default: 3
+    },
+    supportAdd: { // 单表多条数据
+      type: Boolean,
+      default: false
+    },
+    disabled: { // 单表多条数据
+      type: Boolean,
+      default: false
+    }
+  },
+  data () {
+    // let form = {}
+    // let rules = {}
+    let checkMObile = (rule, value, callback) => {
+      if (value === '') {
+        callback(new Error('请输入联系电话'))
+      } else {
+        if (!isMobile(value) && !isPhone(value)) {
+          callback(new Error('联系电话格式不正确'))
+        }
+        callback()
+      }
+    }
+    let checkIdCard = (rule, value, callback) => {
+      if (value === '') {
+        callback(new Error('请输入证件号'))
+      } else {
+        if (!isCard(value)) {
+          callback(new Error('请输入正确的证件号或护照号'))
+        }
+        callback()
+      }
+    }
+    let initForm = (obj, arr) => {
+      let _form = {}
+      // console.log('formInfo', obj)
+      if (Object.keys(obj).length > 0) {
+        _form = { ...obj }
+        // return _form
+      }
+      const itemTypes = ['daterange', 'timerange']
+      arr.forEach(item => {
+        if (item.multiSelect || itemTypes.includes(item.itemType)) {
+          if (item.columnValue && item.columnValue.indexOf(',') > -1) _form[item.columnName] = item.columnValue.split(',')
+          else _form[item.columnName] = (item.columnValue && [item.columnValue]) || []
+        } else _form[item.columnName] = item.columnValue || ''
+      })
+      // console.log('_from0000---', arr)
+      return _form
+    }
+    let initRules = (arr) => {
+      let rules = {}
+      arr.forEach(item => {
+        if (item.required) {
+          if (item.validType === 'mobile') {
+            rules[item.columnName] = [
+              { required: true, validator: checkMObile, trigger: 'blur' }
+            ]
+          } else if (item.validType === 'id_card') {
+            rules[item.columnName] = [
+              { required: true, validator: checkIdCard, trigger: 'blur' }
+            ]
+          } else {
+            rules[item.columnName] = [
+              { required: true, message: `请输入${item.label}`, trigger: 'blur' }
+            ]
+          }
+        }
+      })
+      return rules
+    }
+    let form = initForm(this.formInfo, this.formList)
+    let rules = initRules(this.formList)
+    let tempFormList = [...this.formList]
+    let constForm = {
+      ...form
+    }
+    console.log('-----------------哈哈哈哈哈哈rules', rules)
+    return {
+      openSearch: false,
+      fixedForm: {
+        GRID_ID: '',
+        VILLAGE_ID: '',
+        BUILD_ID: '',
+        UNIT_ID: '',
+        HOME_ID: ''
+      },
+      fixedList: {},
+      form: {
+        ...form
+      },
+      constForm,
+      tempFormList,
+      addCount: 0,
+      addList: [],
+      rulesForm: {
+        ...rules,
+        VILLAGE_ID: [{ required: true, message: `请选择小区`, trigger: 'blur' }],
+        GRID_ID: [{ required: true, message: `请选择网格`, trigger: 'blur' }],
+        BUILD_ID: [{ required: true, message: `请选择楼号`, trigger: 'blur' }],
+        UNIT_ID: [{ required: true, message: `请选择单元`, trigger: 'blur' }],
+        HOME_ID: [{ required: true, message: `请选择房号`, trigger: 'blur' }]
+      },
+      // rules,
+      value: '',
+      optionsV: [],
+      optionsB: [],
+      optionsH: [],
+      optionsG: [],
+      optionsD: [],
+      pickerOptions: {
+        shortcuts: [{
+          text: '最近一周',
+          onClick (picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近一个月',
+          onClick (picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近三个月',
+          onClick (picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90)
+            picker.$emit('pick', [start, end])
+          }
+        }]
+      }
+    }
+  },
+  computed: {
+    sliceList () {
+      return function (data, count) {
+        if (data !== undefined) {
+          let index = 0
+          let arrTemp = []
+          let arrTemp1 = []
+          let arr1 = []
+          let arr2 = []
+          let _i = 0
+          let _index = 0
+          for (let i = 0; i < data.length; i++) {
+            if (data[i].itemType === 'divider' || data[i].itemType === 'checkbox') {
+              _i = i + 1
+            }
+          }
+          arr1 = data.slice(0, _i)
+          arr2 = data.slice(_i, data.length)
+          for (let i = 0; i < arr1.length; i++) {
+            index = parseInt(i / count)
+            if (arrTemp.length <= index) {
+              arrTemp.push([])
+            }
+            arrTemp[index].push(arr1[i])
+          }
+          for (let i = 0; i < arr2.length; i++) {
+            _index = parseInt(i / count)
+            if (arrTemp1.length <= _index) {
+              arrTemp1.push([])
+            }
+            arrTemp1[_index].push(arr2[i])
+          }
+          arrTemp = arrTemp.concat(arrTemp1)
+          return arrTemp
+        }
+      }
+    }
+  },
+  watch: {
+    form: {
+      handler (val, val2) {
+        console.log('valpppp----', val, val2)
+        for (let n in val) {
+          if (this.constForm[n] !== val[n]) {
+            this.handleChangeForm(n)
+            console.log('nnnnnn', n)
+            this.handleChangeGroup(n, val[n])
+          }
+        }
+        this.constForm = { ...val }
+      },
+      deep: true
+    }
+  },
+  created () {
+    this.initForm()
+    console.log('formInfo---gggreg', this.rulesForm)
+    console.log('formList', this.formList)
+    if (this.supportAdd) {
+      this.addList = [...this.mutiList]
+      // console.log('addList----111', this.addList)
+    }
+    if (this.fixed) {
+      this.getGridList()
+      this.getValiheList()
+      this.getBuildList()
+      this.getUniList()
+      this.getHouseList()
+    }
+
+  },
+  mounted () {
+    console.log('this.editUserId', this.editUserId)
+    if (this.editUserId) {
+      this.handleTuomin()
+    }
+
+  },
+  methods: {
+    async handleTuomin () {
+
+      const url = "/data/aggregator/epmetuser/detailByType";
+
+      const { data, code, msg } = await requestPost(url, {
+        id: this.editUserId,
+        type: "checkIcResiUser",
+      });
+
+      if (code === 0) {
+        this.$set(this.form, 'MOBILE', data.mobile)
+        this.$set(this.form, 'ID_CARD', data.idCard)
+      } else {
+        this.$message.error(msg);
+      }
+
+
+    },
+    initForm () {
+      this.formList.forEach(async item => {
+        if (item.optionSourceType === 'remote') {
+          await this.getOptionsLists(item.optionSourceValue).then(res => {
+            item.options = this.getTreeData(res)
+          })
+        }
+      })
+    },
+    getTreeData (data) {
+      if (!Array.isArray(data)) return []
+      let arr = data.map(item => {
+        let _item = {}
+        if (item.children) {
+          if (item.children.length === 0) _item = { ...item, children: undefined }
+          else _item = { ...item, children: this.getTreeData(item.children) }
+        } else {
+          _item = { ...item }
+        }
+        return _item
+      })
+      return arr
+    },
+    handleOpenSearch () {
+      this.openSearch = !this.openSearch
+    },
+    handleAddRow () {
+      this.addList.push({
+        row: this.addList.length,
+        itemList: this.formList
+      })
+    },
+    // 监听固定四列
+    handleFiexedForm (val) {
+      let item = {
+        [val]: this.fixedForm[val]
+      }
+      this.fixedList.push(item)
+      this.$set(this.fixedList, val, this.fixedForm[val])
+    },
+    // 监听分组
+    handleChangeGroup (columnName, value) {
+      this.tempFormList.forEach(item => {
+        if (item.columnName === columnName && item.itemType === 'radio' && item.childGroup) {
+          console.log('columnName', item.columnName, columnName)
+          this.$emit('changegroup', { value, childGroup: item.childGroup })
+        }
+      })
+    },
+    // 监听基础form
+    handleChangeForm (val) {
+      if (this.fixed) {
+        for (let n in this.fixedForm) {
+          if (n === val) {
+            this.$set(this.fixedList, val, this.form[val])
+          }
+        }
+      }
+      this.tempFormList.forEach(item => {
+        if (item.columnName === val) item.isChange = true
+      })
+    },
+    handleChange () {
+      // this.handleForm()
+    },
+    handleChangeGrid (val) {
+      console.log('val', val)
+      this.form.VILLAGE_ID = ''
+      this.form.BUILD_ID = ''
+      this.form.UNIT_ID = ''
+      this.form.HOME_ID = ''
+      this.getValiheList()
+      this.getBuildList()
+      this.getUniList()
+      this.getHouseList()
+    },
+    handleChangeV (val) {
+      console.log('val', val)
+      this.form.BUILD_ID = ''
+      this.form.UNIT_ID = ''
+      this.form.HOME_ID = ''
+      this.getBuildList()
+      this.getUniList()
+      this.getHouseList()
+    },
+    handleChangeB (val) {
+      console.log('val', val)
+      this.form.UNIT_ID = ''
+      this.form.HOME_ID = ''
+      this.getUniList()
+      this.getHouseList()
+    },
+    handleChangeD () {
+      this.form.HOME_ID = ''
+      this.getHouseList()
+    },
+    // 为了实现根据房屋类型改版是否租户的需求
+    handleChangeH (val) {
+      let item = this.optionsH.find(item => item.value === val);
+      if (item && item.type == '1') {
+        this.form.IS_TENANT = '1'
+        console.log('item-----', item)
+      } else this.form.IS_TENANT = '0'
+    },
+    handlerMuscForm () {
+      let arr = []
+      this.addList.forEach(item => {
+        // console.log('handlerMuscForm----000', this.$refs['baseForms' + item.row || item][0].handleForm())
+        arr.push([...this.$refs['baseForms' + item.row][0].handleForm()])
+      })
+      if (arr.length === 0) return arr
+      let arr2 = arr.reduce(function (a, b) { return a.concat(b) })
+      let hash = {}
+      let i = 0
+      let res = []
+      // let finalArr = []
+      arr2.forEach((item) => {
+        let name = item.tableName
+        if (hash[name]) {
+          res[hash[name] - 1].list.push(...item.list)
+        } else {
+          hash[name] = ++i
+          res.push({
+            list: [...item.list],
+            supportAdd: this.supportAdd,
+            tableName: name
+          })
+        }
+      })
+      return res
+    },
+    resetForm () {
+      this.$refs[this.formId].resetFields()
+    },
+    handleForm () {
+      let newForm = []
+      this.$refs[this.formId].validate((valid) => {
+        if (valid) {
+          var hash = {}
+          var i = 0
+          var res = []
+          let ID = this.tempFormList[0].ID
+          this.tempFormList.forEach(function (item) {
+            var name = item.tableName
+            hash[name] ? res[hash[name] - 1].list.push(item) : hash[name] = ++i && res.push({
+              list: [item],
+              ID: item.ID,
+              tableName: name
+            })
+          })
+          // console.log('resssssss', res)
+          const itemTypes = ['cascader', 'daterange', 'timerange']
+          res.forEach(item => {
+            let _form = {}
+            item.list.filter(n => n.isChange).forEach(r => {
+              _form[r.columnName] = r.multiSelect || itemTypes.includes(r.itemType) ? this.form[r.columnName].toString() : this.form[r.columnName]
+              if (r.ID) {
+                _form.ID = r.ID
+              }
+              // return _form
+            })
+            if (this.fixed) {
+              for (let n in this.fixedList) {
+                _form[n] = this.fixedList[n]
+              }
+              if (Object.keys(_form).length > 0) {
+                if (!_form.AGENCY_ID) _form.AGENCY_ID = this.agencyId
+              }
+              if (!_form.ID) _form.ID = ID
+            }
+            console.log('objeckeyssss', Object.keys(_form), _form)
+            newForm.push({
+              tableName: item.tableName,
+              supportAdd: this.supportAdd,
+              ID: item.ID,
+              list: Object.keys(_form).length > 0 ? [{ ..._form }] : []
+            })
+          })
+          console.log('newFormhhhhh', newForm)
+          return newForm
+        } else {
+          console.log('error submit!!')
+          return false
+        }
+      })
+      if (this.supportAdd) newForm = this.handlerMuscForm()
+      return newForm
+    },
+    async getOptionsLists (url) {
+      let options = []
+      // console.log('getOptionsList----', url)
+      await this.$http
+        .post(url, { formCode: 'resi_base_info' })
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg)
+          } else {
+            options = res.data
+          }
+        })
+        .catch(() => {
+          return this.$message.error('网络错误')
+        })
+      return options
+    },
+    getGridList () {
+      const { user } = this.$store.state
+      let purpose = 'query'
+      if (this.disabled) purpose = 'query'
+      else purpose = 'addorupdate'
+      this.$http
+        .post('/gov/org/customergrid/gridoption', { agencyId: this.agencyId, purpose })
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg)
+          } else {
+            console.log('获取查询详情成功', res.data)
+            this.optionsG = res.data
+          }
+        })
+        .catch(() => {
+          return this.$message.error('网络错误')
+        })
+    },
+    getValiheList () {
+      const { user } = this.$store.state
+      this.$http
+        .post('/actual/base/communityQuarters/listQuartersOptions', { gridId: this.form.GRID_ID, agencyId: this.agencyId })
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg)
+          } else {
+            console.log('获取查询详情成功', res.data)
+            this.optionsV = res.data
+          }
+        })
+        .catch(() => {
+          return this.$message.error('网络错误')
+        })
+    },
+    getBuildList () {
+      this.$http
+        .post('/actual/base/communityBuilding/buildingoption', { quartersId: this.form.VILLAGE_ID })
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg)
+          } else {
+            console.log('获取查询详情成功', res.data)
+            this.optionsB = res.data
+          }
+        })
+        .catch(() => {
+          return this.$message.error('网络错误')
+        })
+    },
+    getUniList () {
+      this.$http
+        .post('/actual/base/communityBuildingUnit/unitoption', { buildingId: this.form.BUILD_ID })
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg)
+          } else {
+            console.log('获取查询详情成功', res.data)
+            this.optionsD = res.data
+          }
+        })
+        .catch(() => {
+          return this.$message.error('网络错误')
+        })
+    },
+    getHouseList () {
+      this.$http
+        .post('/actual/base/communityHouse/houseoption', { unitId: this.form.UNIT_ID })
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg)
+          } else {
+            console.log('获取查询详情成功', res.data)
+            this.optionsH = res.data
+          }
+        })
+        .catch(() => {
+          return this.$message.error('网络错误')
+        })
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.resi-form {
+  :deep .el-date-editor.el-input,
+  .el-date-editor.el-input__inner {
+    width: 100% !important;
+  }
+}
+.resi-cell-value .resi-cell-input {
+  width: 168px;
+}
+</style>
+<style lang="scss" scoped>
+.resi-form .resi-row {
+  margin-bottom: 0;
+}
+
+// .resi-form .resi-cell {
+//   display: flex;
+//   align-items: center;
+// .resi-cell-label {
+//   width: 70px;
+//   box-sizing: border-box;
+//   margin-right: 15px;
+//   text-align: right;
+// }
+// .resi-cell-value-radio {
+//   display: flex;
+//   align-items: center;
+//   min-height: 36px;
+// }
+//  .resi-cell-value .resi-cell-input {
+//   width: 180px;
+// }
+
+.resi-cell-value .resi-cell-textarea {
+  width: 300px;
+}
+.resi-cell-col {
+  display: flex;
+  .el-form-item {
+    margin-right: 10px;
+  }
+}
+.resi-cell-select {
+  width: 190px;
+  box-sizing: border-box;
+  margin-right: 10px;
+  &-middle {
+    width: 130px;
+  }
+  &-small {
+    width: 88px;
+  }
+}
+.resi-cell-select:last-child {
+  margin-right: 0;
+}
+// }
+</style>
diff --git a/src/views/components/rangeInput.vue b/src/views/components/rangeInput.vue
index 1fb510035..c16921f3c 100644
--- a/src/views/components/rangeInput.vue
+++ b/src/views/components/rangeInput.vue
@@ -3,7 +3,7 @@
            class="demo-form-inline">
     <div class="flex-div">
       <el-form-item prop="start">
-        <el-input v-model="inputForm.start"
+        <el-input v-model.trim="inputForm.start"
                   class="u-item-width-normal"
                   size="small"
                   :type="inputType"
@@ -12,7 +12,7 @@
                   @change="handleChange" />
       </el-form-item>
       <!-- <el-form-item prop="end">
-        <el-input v-model="inputForm.end"
+        <el-input v-model.trim="inputForm.end"
                   class="wd50"
                   size="small"
                   :type="inputType"
diff --git a/src/views/components/resiChangeTransfer.vue b/src/views/components/resiChangeTransfer.vue
index b30cf0032..edfd15f06 100644
--- a/src/views/components/resiChangeTransfer.vue
+++ b/src/views/components/resiChangeTransfer.vue
@@ -19,7 +19,7 @@
 
         <el-form-item label="迁出时间" prop="outOfTime">
           <el-date-picker
-            v-model="dataForm.outOfTime"
+            v-model.trim="dataForm.outOfTime"
             :picker-options="startPickerOptions"
             type="date"
             value-format="yyyy-MM-dd"
@@ -32,7 +32,7 @@
         </el-form-item>
 
         <el-form-item label="迁出类型" prop="type" style="display: block">
-          <el-radio-group v-model="dataForm.type">
+          <el-radio-group v-model.trim="dataForm.type">
             <el-radio :label="'in'">{{
               "迁往" + rootAgency.organizationName + "内其他区域"
             }}</el-radio>
@@ -44,7 +44,7 @@
           <el-form-item label="迁出至" prop="agencyId">
             <el-cascader
               ref="myCascader"
-              v-model="agencyIdArray"
+              v-model.trim="agencyIdArray"
               class="u-edit-width-normal"
               :key="iscascaderShow"
               :options="casOptions"
@@ -134,7 +134,7 @@
               resize="none"
               class="u-edit-width-normal"
               placeholder="请输入外迁详细地址"
-              v-model="dataForm.address"
+              v-model.trim="dataForm.address"
             >
             </el-input>
           </el-form-item>
@@ -147,13 +147,13 @@
             resize="none"
             class="u-edit-width-normal"
             placeholder="请输入迁出原因"
-            v-model="dataForm.reason"
+            v-model.trim="dataForm.reason"
           >
           </el-input>
         </el-form-item>
         <!-- <el-form-item label=""
                       prop="welfareFlag">
-          <el-checkbox v-model="dataForm.welfareFlag">享受福利</el-checkbox>
+          <el-checkbox v-model.trim="dataForm.welfareFlag">享受福利</el-checkbox>
         </el-form-item> -->
       </el-form>
     </div>
diff --git a/src/views/components/resiExpand/editExpand.vue b/src/views/components/resiExpand/editExpand.vue
new file mode 100644
index 000000000..7a0b2bfcb
--- /dev/null
+++ b/src/views/components/resiExpand/editExpand.vue
@@ -0,0 +1,403 @@
+<template>
+    <div class='g-main'>
+        <el-form :model="form">
+            <div v-for="itemH in formList">
+                <h5>{{ itemH.title }}</h5>
+                <template v-for="itemj in itemH.form">
+                    <section class="f-flex" style="flex-wrap: wrap;">
+                        <el-form-item v-for="(itemk, index) in itemj.children" :key="index" label-width="160px"
+                            :label="itemk.label" :class="[itemk.itemType == 'textarea' ? 'textareaDidth' : '' ,itemk.check?itemk.check:'']">
+                            <template v-if="itemk.itemType == 'radio1'">
+                                <section class="list_item_width_1">
+                                    <el-radio v-for="ns in itemk.opction" :key="ns.value" size="small"
+                                        v-model.trim="form[itemj.id][itemk.formName]" :label="ns.value"
+                                        @click.native="handleFormChange(itemj.id,itemk.formName,itemk.itemType)">
+                                        {{ ns.label }}
+                                    </el-radio>
+                                </section>
+                            </template>
+
+                            <template v-else-if="itemk.itemType == 'select1' && itemk.showFlag !== '0'">
+                                <el-select v-model.trim="form[itemj.id][itemk.formName]" :placeholder="`请选择${itemk.label}`"
+                                    size="small" :multiple="itemk.multiple" :collapse-tags="itemk.collapseTags"
+                                    clearable
+                                    :style="{ 'width': itemk.formName == 'specialCategoryCode' ? '183px' : '' }"
+                                    class="list_item_width_1">
+                                    <el-option v-for="items in itemk.opction" :key="items.value" :label="items.label"
+                                        :value="items.value" @click.native="handleFormChange(itemj.id,itemk.formName,itemk.itemType)">
+                                    </el-option>
+                                </el-select>
+                            </template>
+
+                            <template v-else-if="itemk.itemType == 'textarea1'">
+                                <el-input type="textarea" :placeholder="`请输入${itemk.label}`" class="item-width-textarea"
+                                    maxlength="120" size="small" show-word-limit resize="none" rows="3"
+                                    v-model.trim="form[itemj.id][itemk.formName]" @change.native="handleFormChange(itemj.id,itemk.formName,itemk.itemType)">
+                                </el-input>
+                            </template>
+
+                            <template v-else-if="itemk.itemType == 'input1'">
+                                <el-input :placeholder="`请输入${itemk.label}`" class="list_item_width_1" size="small"
+                                    :style="{ 'margin-right': itemk.label == '备注' ? '50px' : '' }"
+                                    v-model.trim="form[itemj.id][itemk.formName]" clearable @change.native="handleFormChange(itemj.id,itemk.formName,itemk.itemType)">
+                                </el-input>
+                            </template>
+
+                            <template v-else-if="itemk.itemType == 'inputNum'">
+                                <el-input :placeholder="`请输入${itemk.label}`" size="small" class="list_item_width_1-text"
+                                    :style="{ 'margin-right': itemk.label == '备注' ? '50px' : '' }"
+                                    v-model.trim="form[itemj.id][itemk.formName]" clearable
+                                    @blur="checkNumberInput(itemj.id, itemk.formName)" @change.native="handleFormChange(itemj.id,itemk.formName,itemk.itemType)">
+                                </el-input><span class="u-data-tag">元</span>
+                            </template>
+
+                            <template v-else-if="itemk.itemType == 'checkbox'">
+                                <el-checkbox-group size="small" v-model.trim="form[itemj.id][itemk.formName]">
+                                    <el-checkbox v-for="items in itemk.opction" :label="items.value"
+                                        :style="{ 'margin-right': items.label != itemk.label ? '' : '19px' }"
+                                        :key="items.value" :value="items.value" @click.native="handleFormChange(itemj.id,itemk.formName,itemk.itemType)">{{ items.label }}</el-checkbox>
+                                </el-checkbox-group>
+                            </template>
+
+                            <template v-else-if="itemk.itemType == 'datepicker1' && itemk.showFlag !== '0'">
+                                <el-date-picker v-model.trim="form[itemj.id][itemk.formName]" class="list_item_width_1"
+                                    type="date" size="small" clearable placeholder="选择日期" format="yyyy 年 MM 月 dd 日"
+                                    value-format="yyyy-MM-dd" @change="handleFormChange(itemj.id,itemk.formName,itemk.itemType)">
+                                </el-date-picker>
+                            </template>
+
+                            <template v-else-if="itemk.itemType == 'cascader1'">
+                                <el-cascader v-model.trim="form[itemj.id].partyOrgId" :props="casProps"
+                                    :options="itemk.opction" class="list_item_width_1" clearable size="small"
+                                    @change="handlePartyOrgCascadarChange" ></el-cascader>
+                                    <!-- {{form[itemj.id].partyOrgId}} -->
+                            </template>
+
+                            <template v-else-if="itemk.itemType == 'number'">
+                                <el-input-number class="list_item_width_1" size="small" :min="1" :max="10"
+                                    v-model.trim="form[itemj.id][itemk.formName]"></el-input-number>
+                            </template>
+
+                        </el-form-item>
+                    </section>
+                </template>
+            </div>
+
+        </el-form>
+    </div>
+</template>
+
+<script>
+import { requestPost, requestGet } from "@/js/dai/request";
+import nextTick from "dai-js/tools/nextTick";
+
+export default {
+    data() {
+        return {
+            formType: null,
+            formList: [],
+            treeCheckKeyList:[],
+            form: {
+                // 党员信息
+                parymemberInfoDto: {
+                    joinTime: null,
+                    positiveTime: null,
+                    partyOrgId: null,
+                    flowFlag: null,
+                    flowActNum: null,
+                    partyJob: null,
+                    duty: null,
+                    retiredFlag: null,
+                    centerFlag: null,
+                    studyNotNeed: null,
+                    joinBranchName: null,
+                    joinCommunityTime: null
+                },
+                // 残疾信息
+                healthDto: {
+                    disabilityCategoryCode: null,
+                    disabilityLevel: null,
+                    disabilityNum: null,
+                    disabilityDesc: null,
+                    guardianFlag: null,
+                    guardianName: null,
+                    guardianMobile:null,
+                    specialSkillFlag: null,
+                    workCapacityFlag: null
+                },
+                // 大病信息
+                seriousIllnessDto: {
+                    illnessCodes: []
+                },
+                // 慢病信息
+                chronicDiseaseDto: {
+                    chronicDiseaseCodes: []
+                },
+                // 死亡信息
+                deathDto: {
+                    deathTime: null
+                },
+                // 老年人
+                oldPeopleDto: {
+                    oldPeopleCategories: [],
+                    resideSituation: null,
+                    oldSubsidy: null
+                },
+                // 低保人员
+                subsistenceAllowanceDto: {
+                    reasons: [],
+                    category:null ,
+                },
+                // 退役军人
+                veteranDto: {
+                    joinArmyTime: null,
+                    leaveArmyTime: null,
+                    serviceUnit: null,
+                    receiveUnit: null,
+                    settlementAmount: null,
+                    trainDesc: null,
+                    employmentSituation: null,
+                    pubWelfareJobFlag: null
+                },
+
+                // 保障房人员
+                ensureHouseDto: {
+                    liveCommunity: null,
+                    housingNature: null
+                },
+                // 统战人员
+                unitedFrontDto: {
+                    unitedFrontType: null
+                },
+                //特扶人员
+                specialSupportDto: {
+                    specialSupportType: null,//特扶类别
+                    childName: null,//子女姓名
+                    childGender: null,//子女性别
+                    childDeathDate: null,//子女死亡日期
+                    childDisabilityCategoryCode: null,//伤残类别
+                    childDisabilityLevel: null,//伤残等级
+                },
+                // 志愿者
+                volunteerDto: {
+                    volunteerCategory: []
+                },
+            },
+            casProps: {
+                value: 'id',
+                label: 'partyOrgName',
+                lazy: true,
+                lazyLoad: (node, resolve) => {
+                    this.handleNextOrgTreeClick(node, resolve)
+                },
+                checkStrictly: true,
+                multiple: false,
+            },
+            changId:null,
+            changPid:null,
+            changType:null,
+        };
+    },
+    props: {
+    },
+    created() { },
+    activated() {
+    },
+    mounted() {
+    },
+    methods: {
+        handleFormChange(pid,id,type){
+            this.changPid = pid;
+            this.changId = id;
+            this.changType = type;
+            nextTick(1000)
+            this.$emit('submitExpand', this.form,{changId:this.changId,changPid:this.changPid,changType:this.changType})
+        },
+        checkNumberInput(itemj, itemk) {
+            if (this.form[itemj][itemk]) {
+                if (isNaN(this.form[itemj][itemk])) {
+                    this.$message.error("请输入数字");
+                    this.form[itemj][itemk] = "";
+                } else {
+                    this.form[itemj][itemk] = parseFloat(
+                        this.form[itemj][itemk]
+                    );
+                }
+            }
+        },
+        showForm() {
+            this.$nextTick(() => {
+                // console.log(this.form,'拓展组件form');
+                const promises = this.formList.forEach((item) => {
+                    item.form.map(async (group) => {
+                        return group.children.reduce(async (accPromise, item) => {
+                            const acc = await accPromise;
+                            acc[item.formName] = null;
+                            this.form[item.pformName].id = item.id
+                            if (item.itemType == 'checkbox') {
+                                this.form[item.pformName][item.formName] = item.value || []
+                            } else if (item.itemType == 'cascader1' && item.orgPath) {
+                                await this.getOrgTree()
+                                this.form[item.pformName][item.formName] = item.orgPath.split(':') || null
+                            } else{
+                                this.form[item.pformName][item.formName] = item.value != null?item.value:null;
+                            }
+                            if (item.opctionUrl) {
+                                try {
+                                    item.opction = await this.getDictDataForm(item.opctionUrl, item.opctionParams);
+                                } catch (error) {
+                                    console.error('Error fetching options:', error);
+                                }
+                            }
+                            return acc;
+                        }, Promise.resolve({}));
+                    })
+                })
+                Promise.all(promises).then((results) => {
+
+                }).catch((error) => {
+                    console.error('Error fetching options:', error);
+                });
+            })
+        },
+        async getDictDataForm(url, params) {
+            try {
+                const { data } = await this.$http.post(url, params);
+                return data.data;
+            } catch (error) {
+                console.log(error, `获取 ${opctionParams.dictType} 字典`);
+            }
+        },
+
+        handlePartyOrgCascadarChange(selectedNode) {
+            this.form.parymemberInfoDto.partyOrgId = selectedNode[selectedNode.length - 1];
+            this.handleFormChange('parymemberInfoDto','partyOrgId','cascader1')
+        },
+        async handleNextOrgTreeClick(node, resolve) {
+            if(node.children.length>0){
+                resolve(null)
+                return
+            }
+            await this.getTreeChildenList(node, resolve)
+        },
+        async getTreeChildenList(node, resolve) {
+            if (node.data.partyOrgLevel == 7) {
+                resolve(null);
+                return;
+            }
+            const url = "/actual/base/party/org/listNextLevelPartyOrgTreeNodesByPid"
+            let params = {
+                partyOrgPid: node.data.id
+            }
+            const { data, code, msg } = await requestGet(url, params)
+            if (code === 0) {
+                data.forEach(item => {
+                    item.children = null;
+                    item.leaf = item.partyOrgLevel === 7 || item.childrenQty === 0
+                });
+                resolve(data)
+            } else {
+                this.$message.error(msg)
+            }
+        },
+        async getOrgTree() {
+            try {
+                const { data } = await requestGet('/actual/base/party/org/listPartyOrgTreeRoot4Select',{depth: 8})
+                this.formList.forEach(c => {
+                    if (c.formId == "parymemberInfoDto") {
+                        for (let i of c.form[0].children) {
+                            if (i.formName == 'partyOrgId') {
+                                i.opction = [data];
+                            }
+                        }
+                    }
+
+                })
+            } catch (error) {
+                console.log(error);
+            }
+        },
+    },
+    components: {},
+    computed: {},
+    watch: {
+        'form': {
+            handler(newVal, oldVal) {
+                this.$emit('submitExpand', this.form,{changId:this.changId,changPid:this.changPid,changType:this.changType})
+            },
+            deep: true,
+            immediate: true
+        }
+    },
+
+}
+</script>
+
+<style lang='scss' scoped>
+@import "@/assets/scss/modules/management/list-main.scss";
+
+h5 {
+    position: relative;
+    font-size: 16px;
+    margin: 22px 0;
+
+    &::after {
+        content: "";
+        position: absolute;
+        display: inline-block;
+        left: -15px;
+        top: -0px;
+        width: 5px;
+        height: 16px;
+        background-color: #0056d6;
+    }
+}
+.fourFont{
+    position: relative;
+    &::after{
+        content: '*';
+        width: 10px;
+        height: 10px;
+        color: #ff5107;
+        position: absolute;
+        left: 73px;
+        top: 7px;
+    }
+}
+.fiveFont{
+    position: relative;
+    &::after{
+        content: '*';
+        width: 10px;
+        height: 10px;
+        color: #ff5107;
+        position: absolute;
+        left: 62px;
+        top: 7px;
+    }
+}
+.sixFont{
+    position: relative;
+    &::after{
+        content: '*';
+        width: 10px;
+        height: 10px;
+        color: #ff5107;
+        position: absolute;
+        left: 49px;
+        top: 7px;
+    }
+}
+.nineFont{
+    position: relative;
+    &::after{
+        content: '*';
+        width: 10px;
+        height: 10px;
+        color: #ff5107;
+        position: absolute;
+        left: 6px;
+        top: 7px;
+    }
+}
+</style>
diff --git a/src/views/components/resiExpand/index.vue b/src/views/components/resiExpand/index.vue
new file mode 100644
index 000000000..a04e777db
--- /dev/null
+++ b/src/views/components/resiExpand/index.vue
@@ -0,0 +1,359 @@
+<template>
+    <div class='g-main'>
+        <el-form :model="form">
+            <template v-for="itemj in formList">
+                <section class="f-flex" style="flex-wrap: wrap;">
+                    <el-form-item v-for="(itemk, index) in itemj.children"  :key="index" label-width="160px"
+                        :label="itemk.label" :class="[itemk.itemType == 'textarea' ? 'textareaDidth' : '' ,itemk.check?itemk.check:'']">
+                        <template v-if="itemk.itemType == 'radio1'">
+                            <section class="list_item_width_1">
+                                <el-radio v-for="ns in itemk.opction" :key="ns.value" size="small"
+                                    v-model.trim="form[itemj.id][itemk.formName]" :label="ns.value">
+                                    {{ ns.label }}
+                                </el-radio>
+                            </section>
+                        </template>
+                        <template v-else-if="itemk.itemType == 'select1' && itemk.showFlag !== '0'">
+                            <el-select v-model.trim="form[itemj.id][itemk.formName]" :placeholder="`请选择${itemk.label}`"
+                                size="small" :multiple="itemk.multiple" :collapse-tags="itemk.collapseTags" clearable
+                                :style="{ 'width': itemk.formName == 'specialCategoryCode' ? '183px' : '' }"
+                                class="list_item_width_1">
+                                <el-option v-for="items in itemk.opction" :key="items.value" :label="items.label"
+                                    :value="items.value">
+                                </el-option>
+                            </el-select>
+                        </template>
+                        <template v-else-if="itemk.itemType == 'textarea1'">
+                            <el-input type="textarea" :placeholder="`请输入${itemk.label}`" class="item-width-textarea"
+                                maxlength="120" size="small" show-word-limit resize="none" rows="3"
+                                v-model.trim="form[itemj.id][itemk.formName]">
+                            </el-input>
+                        </template>
+                        <template v-else-if="itemk.itemType == 'input1'">
+                            <el-input :placeholder="`请输入${itemk.label}`" class="list_item_width_1" size="small"
+                                :style="{ 'margin-right': itemk.label == '备注' ? '50px' : '' }"
+                                v-model.trim="form[itemj.id][itemk.formName]" clearable>
+                            </el-input>
+                        </template>
+                        <template v-else-if="itemk.itemType == 'inputNum'">
+                            <el-input :placeholder="`请输入${itemk.label}`" size="small" class="list_item_width_1-text"
+                                :style="{ 'margin-right': itemk.label == '备注' ? '50px' : '' }"
+                                v-model.trim="form[itemj.id][itemk.formName]" clearable
+                                @blur="checkNumberInput(itemj.id, itemk.formName)">
+                            </el-input><span class="u-data-tag">元</span>
+                        </template>
+                        <template v-else-if="itemk.itemType == 'checkbox'">
+                            <el-checkbox-group size="small" v-model.trim="form[itemj.id][itemk.formName]">
+                                <el-checkbox v-for="items in itemk.opction" :label="items.value"
+                                    :style="{ 'margin-right': items.label != itemk.label ? '' : '19px' }" :key="items.value"
+                                    :value="items.value">{{ items.label }}</el-checkbox>
+                            </el-checkbox-group>
+                        </template>
+                        <template v-else-if="itemk.itemType == 'datepicker1' && itemk.showFlag !== '0'">
+                            <el-date-picker v-model.trim="form[itemj.id][itemk.formName]" class="list_item_width_1"
+                                type="date" size="small" clearable placeholder="选择日期" format="yyyy 年 MM 月 dd 日"
+                                value-format="yyyy-MM-dd">
+                            </el-date-picker>
+                        </template>
+                        <template v-else-if="itemk.itemType == 'cascader1'">
+                            <el-cascader v-model.trim="form[itemj.id].partyOrgId" :props="casProps" :options="itemk.opction"
+                                class="list_item_width_1" clearable size="small"
+                                @change="handlePartyOrgCascadarChange"></el-cascader>
+                        </template>
+                        <template v-else-if="itemk.itemType == 'number'">
+                            <el-input-number class="list_item_width_1" size="small" :min="1" :max="10"
+                                v-model.trim="form[itemj.id][itemk.formName]"></el-input-number>
+                        </template>
+
+                    </el-form-item>
+                </section>
+            </template>
+        </el-form>
+        <el-row style="margin:24px" v-if="operationType == 'add'">
+            <el-col :span="24" align="center">
+                <el-button size="small" class="diy-button--white" @click="handlerCancle" plain>取消</el-button>
+                <el-button type="primary" size="small" @click="handleClickSUbmitExpand">保存</el-button>
+            </el-col>
+        </el-row>
+    </div>
+</template>
+
+<script>
+import { requestPost, requestGet } from "@/js/dai/request";
+
+export default {
+    data() {
+        return {
+            formType: null,
+            formList: [],
+            form: {
+                // 党员信息
+                parymemberInfoDto: {
+                    joinTime: null,
+                    positiveTime: null,
+                    partyOrgId: null,
+                    flowFlag: null,
+                    flowActNum: null,
+                    partyJob: null,
+                    duty: null,
+                    retiredFlag: null,
+                    centerFlag: null,
+                    studyNotNeed: null,
+                    joinBranchName: null,
+                    joinCommunityTime: null
+                },
+                // 残疾信息
+                healthDto: {
+                    disabilityCategoryCode: null,
+                    disabilityLevel: null,
+                    disabilityNum: null,
+                    disabilityDesc: null,
+                    guardianFlag: null,
+                    guardianName: null,
+                    specialSkillFlag: null,
+                    workCapacityFlag: null
+                },
+                // 大病信息
+                seriousIllnessDto: {
+                    illnessCodes: []
+                },
+                // 慢病信息
+                chronicDiseaseDto: {
+                    chronicDiseaseCodes: []
+                },
+                // 死亡信息
+                deathDto: {
+                    deathTime: null
+                },
+                // 老年人
+                oldPeopleDto: {
+                    oldPeopleCategories:[],
+                    resideSituation: null,
+                    oldSubsidy:null
+                },
+                // 低保人员
+                subsistenceAllowanceDto: {
+                    reasons: [],
+                    category: null
+                },
+                // 退役军人
+                veteranDto: {
+                    joinArmyTime: null,
+                    leaveArmyTime: null,
+                    serviceUnit: null,
+                    receiveUnit: null,
+                    settlementAmount: null,
+                    trainDesc: null,
+                    employmentSituation: null,
+                    pubWelfareJobFlag: null
+                },
+                
+                // 保障房人员
+                ensureHouseDto: {
+                    liveCommunity: null,
+                    housingNature: null
+                },
+                // 统战人员
+                unitedFrontDto: {
+                    unitedFrontType: null
+                },
+                //特扶人员
+                specialSupportDto: {
+                    specialSupportType: null,//特扶类别
+                    childName: null,//子女姓名
+                    childGender: null,//子女性别
+                    childDeathDate: null,//子女死亡日期
+                    childDisabilityCategoryCode: null,//伤残类别
+                    childDisabilityLevel: null,//伤残等级
+                },
+                // 志愿者
+                volunteerDto: {
+                    volunteerCategory: []
+                },
+
+            },
+            casProps: {
+                value: 'id',
+                label: 'partyOrgName',
+                lazy: true,
+                lazyLoad: (node, resolve) => {
+                    this.handleNextOrgTreeClick(node, resolve)
+                },
+                isLeaf: (data, node) => {
+                    console.log(data);
+                    //根据后台返回的数据判断是否还有下级 是否显示箭头图标
+                    //el-tree懒加载无子级数据时去掉下拉箭头
+                    if (data.partyOrgLevel == 7 || data.childrenQty == 0) {
+                        return true
+                    }
+                },
+                checkStrictly: true,
+                multiple: false,
+            },
+        };
+    },
+    props: {
+        operationType:{
+            type:String,
+            default:''
+        }
+    },
+    created() {
+    },
+    activated() {
+        this.getOrgTree()
+    },
+    mounted() {
+    },
+    methods: {
+        checkNumberInput(itemj, itemk) {
+            if (this.form[itemj][itemk]) {
+                if (isNaN(this.form[itemj][itemk])) {
+                    this.$message.error("请输入数字");
+                    this.form[itemj][itemk] = "";
+                } else {
+                    this.form[itemj][itemk] = parseFloat(
+                        this.form[itemj][itemk]
+                    );
+                }
+            }
+        },
+        showForm() {
+            this.$nextTick(() => {
+                const promises = this.formList.map(async (group) => {
+                    return group.children.reduce(async (accPromise, item) => {
+                        const acc = await accPromise;
+                        acc[item.formName] = null;
+                        if (item.opctionUrl) {
+                            try {
+                                item.opction = await this.getDictDataForm(item.opctionUrl, item.opctionParams);
+                            } catch (error) {
+                                console.error('Error fetching options:', error);
+                            }
+                        }
+                        return acc;
+                    }, Promise.resolve({}));
+                });
+
+                Promise.all(promises).then((results) => {
+                }).catch((error) => {
+                    console.error('Error fetching options:', error);
+                });
+                this.getOrgTree()
+                console.log(this.form, '子组件form');
+                console.log(this.formList, '子组件formList');
+            })
+        },
+        async getDictDataForm(url, params) {
+            try {
+                const { data } = await this.$http.post(url, params);
+                return data.data;
+            } catch (error) {
+                console.log(error, `获取 ${opctionParams.dictType} 字典`);
+            }
+        },
+        handlerCancle() {
+            this.$emit('hideExpand', this.formType)
+        },
+        handleClickSUbmitExpand() {
+            this.$emit('submitExpand', this.form, this.formType)
+        },
+        handlePartyOrgCascadarChange(selectedNode) {
+            this.form.parymemberInfoDto.partyOrgId = selectedNode[selectedNode.length - 1];
+        },
+        async handleNextOrgTreeClick(node, resolve) {
+            await this.getTreeChildenList(node, resolve)
+        },
+        async getTreeChildenList(node, resolve) {
+            if (node.data.partyOrgLevel === 7) {
+                resolve(null);
+                return;
+            }
+            const url = "/actual/base/party/org/listNextLevelPartyOrgTreeNodesByPid"
+            let params = {
+                partyOrgPid: node.data.id
+            }
+            const { data, code, msg } = await requestGet(url, params)
+            if (code === 0) {
+                data.forEach(item => {
+                    item.children = null;
+                    item.leaf = item.partyOrgLevel === 7 || item.childrenQty === 0
+                });
+                resolve(data)
+            } else {
+                this.$message.error(msg)
+            }
+        },
+        async getOrgTree() {
+            try {
+                const { data } = await requestGet('/actual/base/party/org/listPartyOrgTreeRoot4Select', { depth: 8 })
+                this.formList.forEach(c => {
+                    for (let i of c.children) {
+                        if (i.formName == 'partyOrgId') {
+                            i.opction = [data];
+                        }
+                    }
+                })
+            } catch (error) {
+                console.log(error);
+            }
+        },
+
+    },
+    components: {},
+    computed: {},
+    watch: {},
+}
+</script>
+
+<style lang='scss' scoped>
+@import "@/assets/scss/modules/management/list-main.scss";
+.fourFont{
+    position: relative;
+    &::after{
+        content: '*';
+        width: 10px;
+        height: 10px;
+        color: #ff5107;
+        position: absolute;
+        left: 73px;
+        top: 7px;
+    }
+}
+.fiveFont{
+    position: relative;
+    &::after{
+        content: '*';
+        width: 10px;
+        height: 10px;
+        color: #ff5107;
+        position: absolute;
+        left: 62px;
+        top: 7px;
+    }
+}
+.sixFont{
+    position: relative;
+    &::after{
+        content: '*';
+        width: 10px;
+        height: 10px;
+        color: #ff5107;
+        position: absolute;
+        left: 49px;
+        top: 7px;
+    }
+}
+.nineFont{
+    position: relative;
+    &::after{
+        content: '*';
+        width: 10px;
+        height: 10px;
+        color: #ff5107;
+        position: absolute;
+        left: 6px;
+        top: 7px;
+    }
+}
+</style>
diff --git a/src/views/components/resiForm.vue b/src/views/components/resiForm.vue
index 186d7767b..ea92d45b7 100644
--- a/src/views/components/resiForm.vue
+++ b/src/views/components/resiForm.vue
@@ -14,7 +14,7 @@
                        ref="myCascader"
                        clearable
                        size="small"
-                       v-model=" selGridId"
+                       v-model.trim=" selGridId"
                        :options="orgOptions"
                        :props="orgOptionProps"
                        @change="handleChangeAgency"></el-cascader>
@@ -124,7 +124,7 @@
             </el-input>
           </template>
           <template v-else-if="item.itemType == 'select'">
-            <el-select v-model="form[item.formName]"
+            <el-select v-model.trim="form[item.formName]"
                        :placeholder="`请选择${item.label}`"
                        size="small"
                        clearable
@@ -158,7 +158,7 @@
                          :true-label="'1'"
                          :false-label="'0'"
                          size="small"
-                         v-model="form[items.formName]"
+                         v-model.trim="form[items.formName]"
                          @change="val => handleChangeCheckbox(items,val)">
             </el-checkbox>
           </template>
@@ -177,8 +177,8 @@
 
         </el-form-item>
       </div>
-      <!-- 这里开始就是底部的input了------------------------------------------------------------------->
-      <el-tabs v-model="activeName"
+      <!-- 这里开始就是底部的表单了------------------------------------------------------------------->
+      <el-tabs v-model.trim="activeName"
                @tab-click="handleClickTab">
         <el-tab-pane v-for="item in tabsList"
                      :key="item.groupId"
@@ -193,7 +193,7 @@
                 <el-form-item label-width="160px"
                               label="特扶类别">
 
-                  <el-select v-model="form[itemj.id].specialSupportType"
+                  <el-select v-model.trim="form[itemj.id].specialSupportType"
                              :placeholder="`请选择特扶类别`"
                              size="small"
                              clearable
@@ -218,7 +218,7 @@
                 </el-form-item>
                 <el-form-item label-width="160px"
                               label="子女性别">
-                  <el-select v-model="form[itemj.id].childGender"
+                  <el-select v-model.trim="form[itemj.id].childGender"
                              :placeholder="`请选择子女性别`"
                              size="small"
                              clearable
@@ -246,7 +246,7 @@
                 <el-form-item v-if="form[itemj.id].specialSupportType==='2'"
                               label-width="160px"
                               label="伤残类别">
-                  <el-select v-model="form[itemj.id].childDisabilityCategoryCode"
+                  <el-select v-model.trim="form[itemj.id].childDisabilityCategoryCode"
                              :placeholder="`请选择伤残类别`"
                              size="small"
                              clearable
@@ -261,7 +261,7 @@
                 <el-form-item v-if="form[itemj.id].specialSupportType==='2'"
                               label-width="146px"
                               label="伤残等级">
-                  <el-select v-model="form[itemj.id].childDisabilityLevel"
+                  <el-select v-model.trim="form[itemj.id].childDisabilityLevel"
                              :placeholder="`请选择伤残等级`"
                              size="small"
                              clearable
@@ -307,7 +307,7 @@
                     </section>
                   </template>
                   <template v-else-if="itemk.itemType=='select1' &&itemk.showFlag!=='0' ">
-                    <el-select v-model="form[itemj.id][itemk.formName]"
+                    <el-select v-model.trim="form[itemj.id][itemk.formName]"
                                :placeholder="`请选择${itemk.label}`"
                                size="small"
                                :multiple="itemk.multiple"
@@ -355,7 +355,7 @@
                   </template>
                   <template v-else-if="itemk.itemType=='checkbox'">
                     <el-checkbox-group size="small"
-                                       v-model="form[itemj.id][itemk.formName]">
+                                       v-model.trim="form[itemj.id][itemk.formName]">
                       <el-checkbox v-for="items in itemk.opction"
                                    :label="items.value"
                                    :style="{'margin-right':items.label != itemk.label? '' :'19px'}"
@@ -375,7 +375,7 @@
                     </el-date-picker>
                   </template>
                   <template v-else-if="itemk.itemType == 'cascader1'">
-                    <el-cascader v-model="form.parymemberInfoDto.partyOrgId"
+                    <el-cascader v-model.trim="form.parymemberInfoDto.partyOrgId"
                                    :props="casProps"
                                    :options="itemk.opction"
                                    class="u-item-width-normal"
@@ -1714,7 +1714,6 @@ export default {
       }
     },
 
-
     getValiheList () {
       const { user } = this.$store.state
       this.$http.post('/actual/base/communityQuarters/listQuartersOptions', { gridId: this.form.gridId, agencyId: user.agencyId }).then(({ data: res }) => {
@@ -2299,7 +2298,7 @@ export default {
       this.form.remark = data.remark ? data.remark : ''
       if (data.categoryInfo) {
         this.form.categoryId = data.categoryInfo.id,// 临时写死
-          this.form.partyFlag = data.categoryInfo.partyFlag.toString()
+        this.form.partyFlag = data.categoryInfo.partyFlag.toString()
         this.form.subsistenceAllowanceFlag = data.categoryInfo.subsistenceAllowanceFlag.toString()
         this.form.ensureHouseFlag = data.categoryInfo.ensureHouseFlag.toString()
         this.form.unemployedFlag = data.categoryInfo.unemployedFlag.toString()
@@ -2446,9 +2445,10 @@ export default {
         if (res.code !== 0) {
           return this.$message.error(res.msg);
         } else {
-
           if (res.data && res.data.chronicDiseaseCode) {
             res.data.chronicDiseaseCode = res.data.chronicDiseaseCode.split(',')
+          }else{
+            res.data.chronicDiseaseCode = []
           }
 
           this.form.healthDto = res.data ? res.data : { // 健康
@@ -2478,7 +2478,7 @@ export default {
     },
     // 工作信息详情
     residentWorkInfo (id) {
-      if (this.newForm.healthDto) return
+      if (this.newForm.workInfoDto) return
       this.$http.get(`/actual/base/residentWorkInfo/detail/${id}`).then(({ data: res }) => {
         if (res.code !== 0) {
           return this.$message.error(res.msg);
@@ -2932,7 +2932,6 @@ export default {
       }
 
       if (this.newForm.volunteerDto) {
-
         this.newForm.volunteerDto = this.form.volunteerDto
       }
 
@@ -2946,12 +2945,9 @@ export default {
         this.newForm.postDto = this.form.postDto
       }
       if (this.newForm.tenantDto) {
-
         this.newForm.tenantDto = this.form.tenantDto
       }
-
       if (this.newForm.specialSupportDto) {
-
         this.newForm.specialSupportDto = this.form.specialSupportDto
       }
     },
diff --git a/src/views/components/resiInfo.vue b/src/views/components/resiInfo.vue
index 7aeaf357d..2d973d4b5 100644
--- a/src/views/components/resiInfo.vue
+++ b/src/views/components/resiInfo.vue
@@ -183,7 +183,7 @@
             </el-col>
         </el-row>
         <div class="title-small title_postion f-top40 f-bot24">其他信息</div>
-        <el-tabs v-model="activeName" @tab-click="handleClick">
+        <el-tabs v-model.trim="activeName" @tab-click="handleClick">
             <el-tab-pane label="教育">
                 <div class="f-flex f-bto16 f-top24">
                     <div class="f-labels">文化程度:</div>
diff --git a/src/views/components/resiInfo/ensureHouseDto/index.vue b/src/views/components/resiInfo/ensureHouseDto/index.vue
new file mode 100644
index 000000000..75eac2b4d
--- /dev/null
+++ b/src/views/components/resiInfo/ensureHouseDto/index.vue
@@ -0,0 +1,20 @@
+<template>
+    <div class=''>保障房</div>
+</template>
+
+<script>
+export default {
+    data() {
+        return {};
+    },
+    created() {},
+    methods: {},
+    components:{},
+    computed:{},
+    watch: {},
+}
+</script>
+
+<style lang='scss'>
+
+</style>
diff --git a/src/views/components/resiInfo/oldPeopleDto/index.vue b/src/views/components/resiInfo/oldPeopleDto/index.vue
new file mode 100644
index 000000000..0bbaac646
--- /dev/null
+++ b/src/views/components/resiInfo/oldPeopleDto/index.vue
@@ -0,0 +1,20 @@
+<template>
+    <div class=''>老年人</div>
+</template>
+
+<script>
+export default {
+    data() {
+        return {};
+    },
+    created() {},
+    methods: {},
+    components:{},
+    computed:{},
+    watch: {},
+}
+</script>
+
+<style lang='scss'>
+
+</style>
diff --git a/src/views/components/resiInfo/parymemberInfoDto/index.vue b/src/views/components/resiInfo/parymemberInfoDto/index.vue
new file mode 100644
index 000000000..dc161139a
--- /dev/null
+++ b/src/views/components/resiInfo/parymemberInfoDto/index.vue
@@ -0,0 +1,20 @@
+<template>
+    <div class=''>党员</div>
+</template>
+
+<script>
+export default {
+    data() {
+        return {};
+    },
+    created() {},
+    methods: {},
+    components:{},
+    computed:{},
+    watch: {},
+}
+</script>
+
+<style lang='scss'>
+
+</style>
diff --git a/src/views/components/resiInfo/postDto/index.vue b/src/views/components/resiInfo/postDto/index.vue
new file mode 100644
index 000000000..e4e102da2
--- /dev/null
+++ b/src/views/components/resiInfo/postDto/index.vue
@@ -0,0 +1,20 @@
+<template>
+    <div class=''>公益岗</div>
+</template>
+
+<script>
+export default {
+    data() {
+        return {};
+    },
+    created() {},
+    methods: {},
+    components:{},
+    computed:{},
+    watch: {},
+}
+</script>
+
+<style lang='scss'>
+
+</style>
diff --git a/src/views/components/resiInfo/specialSupportDto/index.vue b/src/views/components/resiInfo/specialSupportDto/index.vue
new file mode 100644
index 000000000..c0a1c1b95
--- /dev/null
+++ b/src/views/components/resiInfo/specialSupportDto/index.vue
@@ -0,0 +1,20 @@
+<template>
+    <div class=''>特扶人员</div>
+</template>
+
+<script>
+export default {
+    data() {
+        return {};
+    },
+    created() {},
+    methods: {},
+    components:{},
+    computed:{},
+    watch: {},
+}
+</script>
+
+<style lang='scss'>
+
+</style>
diff --git a/src/views/components/resiInfo/unitedFrontDto/index.vue b/src/views/components/resiInfo/unitedFrontDto/index.vue
new file mode 100644
index 000000000..2e6074e40
--- /dev/null
+++ b/src/views/components/resiInfo/unitedFrontDto/index.vue
@@ -0,0 +1,20 @@
+<template>
+    <div class=''>统战人员</div>
+</template>
+
+<script>
+export default {
+    data() {
+        return {};
+    },
+    created() {},
+    methods: {},
+    components:{},
+    computed:{},
+    watch: {},
+}
+</script>
+
+<style lang='scss'>
+
+</style>
diff --git a/src/views/components/resiInfo/veteranDto/index.vue b/src/views/components/resiInfo/veteranDto/index.vue
new file mode 100644
index 000000000..ecd2498d5
--- /dev/null
+++ b/src/views/components/resiInfo/veteranDto/index.vue
@@ -0,0 +1,20 @@
+<template>
+    <div class=''>退役军人</div>
+</template>
+
+<script>
+export default {
+    data() {
+        return {};
+    },
+    created() {},
+    methods: {},
+    components:{},
+    computed:{},
+    watch: {},
+}
+</script>
+
+<style lang='scss'>
+
+</style>
diff --git a/src/views/components/resiInfo/volunteerDto/index.vue b/src/views/components/resiInfo/volunteerDto/index.vue
new file mode 100644
index 000000000..2fa007f94
--- /dev/null
+++ b/src/views/components/resiInfo/volunteerDto/index.vue
@@ -0,0 +1,20 @@
+<template>
+    <div class=''>志愿者</div>
+</template>
+
+<script>
+export default {
+    data() {
+        return {};
+    },
+    created() {},
+    methods: {},
+    components:{},
+    computed:{},
+    watch: {},
+}
+</script>
+
+<style lang='scss'>
+
+</style>
diff --git a/src/views/components/resiSearch.vue b/src/views/components/resiSearch.vue
index ff828fe1a..5a3cc6f04 100644
--- a/src/views/components/resiSearch.vue
+++ b/src/views/components/resiSearch.vue
@@ -2,256 +2,150 @@
   <div class="resi-container">
     <!-- <el-card class="resi-card"> -->
     <div class="g-main">
-      <el-form :inline="true"
-               class="header_form_box"
-               :model="form"
-               :label-width="'100px'">
-
-        <el-form-item label="居民姓名">
-          <el-input v-model="form.name"
-                    placeholder="请输入"
-                    size="small"
-                    @keydown.native.enter="handleSearchFrom"
-                    class="u-item-width-normal"
-                    clearable></el-input>
+      <el-form :inline="true" class="header_form_box" :model="form" :label-width="'105px'">
+        <el-form-item label="政治面貌">
+          <el-select v-model.trim="form.partyFlag" class="u-item-width-normal" clearable size="small">
+            <template v-for="item in partyList">
+              <el-option :label='item.label' :value='item.value'> </el-option>
+            </template>
+          </el-select>
         </el-form-item>
-        <el-form-item label="联系电话">
-          <el-input v-model="form.mobile"
-                    size="small"
-                    placeholder="请输入"
-                    class="u-item-width-normal"
-                    clearable></el-input>
+        <el-form-item label="健康状态">
+          <el-select v-model.trim="form.healthStatus" collapse-tags multiple class="u-item-width-normal" clearable
+            size="small">
+            <template v-for="item in healthStatusList">
+              <el-option :label='item.label' :value='item.value'> </el-option>
+            </template>
+          </el-select>
         </el-form-item>
-        <el-form-item label="证件号">
-          <el-input v-model="form.idNum"
-                    size="small"
-                    placeholder="请输入"
-                    class="u-item-width-normal"
-                    clearable></el-input>
+        <el-form-item label="关注人群">
+          <el-cascader
+          size="small"
+          class="u-item-width-normal"
+          v-model.trim="form.attentionCrowds" 
+          :options="resiClass"
+          :props="{ multiple: true,checkStrictly: true}"
+          collapse-tags
+          clearable
+          ></el-cascader>
         </el-form-item>
-        <el-form-item label="居民性别">
-          <el-select v-model="form.gender"
-                     class="u-item-width-normal"
-                     clearable
-                     size="small">
-            <el-option label='男'
-                       value='1'> </el-option>
-            <el-option label='女'
-                       value='2'> </el-option>
+        <el-form-item label="特殊人群">
+          <el-select v-model.trim="form.specialCategoryCodes" class="u-item-width-normal" clearable size="small" collapse-tags
+            multiple>
+            <template v-for="item in specialCategoryList">
+              <el-option :label='item.label' :value='item.value'> </el-option>
+            </template>
           </el-select>
         </el-form-item>
-        <el-form-item label="出生日期">
-          <el-date-picker v-model="form.birthdayStart"
-                          type="date"
-                          size="small"
-                          class="u-item-width-daterange"
-                          value-format="yyyy-MM-dd"
-                          placeholder="开始日期"
-                          :picker-options="pickerOptionsStart">
-          </el-date-picker>
-          <span class="u-data-tag">至</span>
-          <el-date-picker v-model="form.birthdayEnd"
-                          type="date"
-                          size="small"
-                          value-format="yyyy-MM-dd"
-                          class="u-item-width-daterange u-data-tag"
-                          placeholder="结束日期"
-                          :picker-options="pickerOptionsEnd">
-          </el-date-picker>
+        <el-form-item label="就业状态">
+          <el-select v-model.trim="form.careerStatus" class="u-item-width-normal" clearable size="small">
+            <template v-for="item in careerStatusList">
+              <el-option :label='item.label' :value='item.value'> </el-option>
+            </template>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="身份">
+          <el-select v-model.trim="form.identity" class="u-item-width-normal" clearable size="small">
+            <template v-for="item in projectStaffList">
+              <el-option :label='item.label' :value='item.value'> </el-option>
+            </template>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="人户状况">
+          <el-select v-model.trim="form.householdSituation" class="u-item-width-normal" clearable size="small">
+            <template v-for="item in household">
+              <el-option :label='item.label' :value='item.value'> </el-option>
+            </template>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="人房关系">
+          <el-select v-model.trim="form.resiHouseRel" class="u-item-width-normal" clearable size="small">
+            <template v-for="item in resiHouseRelList">
+              <el-option :label='item.label' :value='item.value'> </el-option>
+            </template>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="名称模糊查询">
+          <el-select v-model.trim="basicType" class="u-item-width-service" clearable size="small">
+            <template >
+              <el-option @click.native="handelClickBasicType" :label='item.label' :value='item.value' v-for="(item, index) in basicInfoList" :key="index"> </el-option>
+            </template>
+          </el-select>
+        </el-form-item>
+        <el-form-item v-for="(item, index) in basicInfoList" :key="index" v-if="basicType == item.value">
+          <el-input v-model.trim="form[item.value]" class="u-item-width-service" placeholder="请输入" clearable size="small">
+          </el-input>
         </el-form-item>
         <el-form-item label="居民年龄">
-          <el-input v-model="form.ageStart"
-                    class="u-item-width-daterange"
-                    placeholder="请输入"
-                    clearable
-                    size="small">
+          <el-input v-model.trim="form.ageStart" @change="handleAgeChange" class="u-item-width-daterange" placeholder="请输入" clearable size="small">
           </el-input>
           <span class="u-data-tag">至</span>
-          <el-input v-model="form.ageEnd"
-                    @change="handleAgeChange"
-                    class="u-item-width-daterange u-data-tag"
-                    placeholder="请输入"
-                    clearable
-                    size="small">
+          <el-input v-model.trim="form.ageEnd" @change="handleAgeChange" class="u-item-width-daterange u-data-tag"
+            placeholder="请输入" clearable size="small">
           </el-input>
         </el-form-item>
-        <el-form-item label="文化程度">
-          <el-select v-model="form.cultureLevel"
-                     class="u-item-width-normal"
-                     clearable
-                     size="small">
-            <template v-for="item in Education">
-              <el-option :label='item.label'
-                         :value='item.value'> </el-option>
-            </template>
-
-          </el-select>
-        </el-form-item>
-        <el-form-item label="本地户籍">
-          <el-select v-model="form.localResidenceFlag"
-                     class="u-item-width-normal"
-                     clearable
-                     size="small">
-            <el-option label='是'
-                       value='1'> </el-option>
-            <el-option label='否'
-                       value='0'> </el-option>
+        <el-form-item label="性别">
+          <el-select v-model.trim="form.gender" class="u-item-width-normal" clearable size="small">
+            <el-option label='男' value='1'> </el-option>
+            <el-option label='女' value='2'> </el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="居民类别">
-          <el-select v-model="form.categoryKey"
-                     collapse-tags
-                     multiple
-                     class="u-item-width-normal"
-                     clearable
-                     size="small">
-            <template v-for="item in resiClass">
-              <el-option :label='item.label'
-                         :value='item.value'> </el-option>
+        <el-form-item label="文化程度">
+          <el-select v-model.trim="form.cultureLevel" class="u-item-width-normal" clearable size="small">
+            <template v-for="item in Education">
+              <el-option :label='item.label' :value='item.value'> </el-option>
             </template>
           </el-select>
         </el-form-item>
-        <el-form-item label="人户状况">
-          <el-select v-model="form.householdSituation"
-                     class="u-item-width-normal"
-                     clearable
-                     size="small">
-            <template v-for="item in household">
-              <el-option :label='item.label'
-                         :value='item.value'> </el-option>
+        <el-form-item label="国籍">
+          <el-select v-model.trim="form.nationality" class="u-item-width-normal" clearable size="small">
+            <template v-for="item in nationalityList">
+              <el-option :label='item.label' :value='item.value'> </el-option>
             </template>
           </el-select>
         </el-form-item>
         <el-form-item label="民族">
-          <el-select v-model="form.nation"
-                     class="u-item-width-normal"
-                     clearable
-                     size="small">
+          <el-select v-model.trim="form.nation" class="u-item-width-normal" clearable size="small">
             <template v-for="item in nation">
-              <el-option :label='item.label'
-                         :value='item.value'> </el-option>
+              <el-option :label='item.label' :value='item.value'> </el-option>
             </template>
           </el-select>
         </el-form-item>
-        <el-form-item>
-          <span style="width:100px;text-align: right;padding-right:14px;display: inline-block; ">所属组织:</span>
-          <el-cascader class="u-item-width-normal"
-                       size="small"
-                       ref="myCascader"
-                       v-model="form.agencyId"
-                       :options="orgOptions"
-                       :props="orgOptionProps"
-                       :show-all-levels="false"
-                       @change="handleChangeAgency"
-                       clearable></el-cascader>
+        <el-form-item label="完整度得分">
+          <el-input v-model.trim="form.integrityScoreFrom" @change="informationChange(form.integrityScoreFrom,'from')" class="u-item-width-daterange" placeholder="请输入" clearable size="small">
+          </el-input>
+          <span class="u-data-tag">至</span>
+          <el-input v-model.trim="form.integrityScoreTo"  @change="informationChange(form.integrityScoreTo,'to')"  class="u-item-width-daterange u-data-tag"
+            placeholder="请输入" clearable size="small">
+          </el-input>
         </el-form-item>
-        <el-form-item prop="villageId">
-          <div class="resi-cell">
-            <div class="resi-cell-value">
-              <span style="width:100px;text-align: right;padding-right:14px;display: inline-block; ">所属房屋:</span>
-              <el-select v-model.trim="form.villageId"
-                         placeholder="请选择小区"
-                         size="small"
-                         filterable
-                         clearable
-                         class="u-item-width-communitycascader"
-                         @clear="handleClearVillage"
-                         @change="handleChangeV"
-                         v-el-select-loadmore="loadmore"
-                         >
-                <el-option v-for="item in optionsV"
-                           :key="item.value"
-                           :label="item.label"
-                           :value="item.value">
-                </el-option>
-              </el-select>
-              <el-select v-model.trim="form.buildId"
-                         placeholder="楼号"
-                         size="small"
-                         filterable
-                         clearable
-                         style="margin-left: 5px"
-                         class="u-item-width-buildcascader"
-                         :disabled="changeVDisabled"
-                         @clear="handleClearBuild"
-                         @change="handleChangeB">
-                <el-option v-for="item in optionsB"
-                           :key="item.value"
-                           :label="item.label"
-                           :value="item.value">
-                </el-option>
-              </el-select>
-              <el-select v-model.trim="form.unitId"
-                         :disabled="changeBDisabled"
-                         placeholder="单元"
-                         size="small"
-                         filterable
-                         clearable
-                         style="margin-left: 5px"
-                         class="u-item-width-buildcascader"
-                         @click="handleClearDan"
-                         @change="handleChangeD">
-                <el-option v-for="item in optionsD"
-                           :key="item.value"
-                           :label="item.label"
-                           :value="item.value">
-                </el-option>
-              </el-select>
-              <el-select v-model.trim="form.homeId"
-                         :disabled="changeDDisabled"
-                         placeholder="房号"
-                         size="small"
-                         filterable
-                         clearable
-                         style="margin-left: 5px"
-                         class="u-item-width-buildcascader">
-                <el-option v-for="item in optionsH"
-                           :key="item.value"
-                           :label="item.label"
-                           :value="item.value">
-                </el-option>
-              </el-select>
-            </div>
-          </div>
+        <el-form-item label="更新时间">
+          <el-date-picker v-model.trim="form.updateTimeStart" type="datetime" size="small" class="u-item-width-daterange"
+            value-format="yyyy-MM-dd HH:mm:ss" placeholder="开始日期" :picker-options="pickerOptionsStart">
+          </el-date-picker>
+          <span class="u-data-tag">至</span>
+          <el-date-picker v-model.trim="form.updateTimeEnd" type="datetime" size="small" value-format="yyyy-MM-dd HH:mm:ss"
+            class="u-item-width-daterange u-data-tag" placeholder="结束日期" :picker-options="pickerOptionsEnd">
+          </el-date-picker>
         </el-form-item>
         <el-form-item label="备注">
-          <el-input v-model="form.remark"
-                    placeholder="请输入"
-                    size="small"
-                    class="u-item-width-normal"
-                    clearable></el-input>
+          <el-input v-model.trim="form.remark" placeholder="请输入" size="small" class="u-item-width-normal"
+            clearable></el-input>
         </el-form-item>
       </el-form>
-
     </div>
-    <el-row v-if="showSmartSearchForm"
-            class="resi-row-more f-m0">
+    <el-row v-if="showSmartSearchForm" class="resi-row-more f-m0">
       <el-col :span="24">
-        <el-button v-for="btnItem in btnList"
-                   :key="btnItem.index"
-                   size="small"
-                   :class="selBtnIndex === btnItem.index ? 'diy-button--white' : 'diy-button--common'"
-                   @click="handelSelSmartBtn(btnItem.index)">{{ btnItem.name }}</el-button>
+        <el-button v-for="btnItem in btnList" :key="btnItem.index" size="small"
+          :class="selBtnIndex === btnItem.index ? 'diy-button--white' : 'diy-button--common'"
+          @click="handelSelSmartBtn(btnItem.index)">{{ btnItem.name }}</el-button>
 
       </el-col>
       <el-col>
-        <smart-search-rule ref="ref_rule"
-                           :formType="formType"></smart-search-rule>
+        <smart-search-rule ref="ref_rule" :formType="formType"></smart-search-rule>
       </el-col>
     </el-row>
-    <!-- <el-row v-if="isArrow" class="resi-search">
 
-      <el-col :span="24">
-        <el-button type="primary" size="small" plain class="diy-button--blue"
-          @click="handleSmartSearch"><span>{{showSmartSearchForm?'关闭智能查询':'智能查询'}}</span></el-button>
-        <el-button style="margin-left:10px" size="small" class="diy-button--white" type="primary" plain
-          @click="resetForm">重置</el-button>
-        <el-button type="primary" size="small" class="diy-button--blue" @click="handleSearch" plain>查询 </el-button>
-        <el-button style="margin-left:15px" size="small" class="div-table-button--blue showUnfold" type="text"
-          @click="boxHeight = !boxHeight">{{ boxHeight ? '收起' : '展开' }}<i
-            :class="boxHeight ? 'el-icon-arrow-up' : 'el-icon-arrow-down'"></i></el-button>
-      </el-col>
-    </el-row> -->
 
   </div>
 </template>
@@ -282,7 +176,7 @@ export default {
       default: false
     }
   },
-  data () {
+  data() {
     let initForm = (arr, columnName) => {
       let _form = {}
       arr.forEach((item) => {
@@ -343,23 +237,181 @@ export default {
       boxHeight: true,
       pageLoading: false,
       openSearch: false,
+      basicType: "name",
+      basicInfoList: [
+        {
+          label: '姓名',
+          value: 'name'
+        },
+        {
+          label: '联系电话',
+          value: 'mobile'
+        },
+        {
+          label: '证件号',
+          value: 'idNum'
+        },
+        {
+          label: '籍贯',
+          value: 'nativePlace'
+        },
+        {
+          label: '备注',
+          value: 'remark'
+        }
+      ],
       optionsV: [],
       optionsB: [],
       optionsH: [],
       optionsD: [],
-      optionsG: [],
       orgOptions: [],
       orgOptionProps,
       agencyIdArray: [],
-      value: '',
-      // 1
       Education: [],
       nation: [],
+      nationalityList: [],
       household: [],
-      resiClass: [],
+      resiClass: [
+   
+    {
+        "label": "老年人",
+        "value": "OLD_PEOPLE_FLAG",
+        "children": [
+        {
+        "label": "失能老人",
+        "value": "DISABLED_FLAG",
+        "children": null
+    }, {
+        "label": "空巢老人",
+        "value": "EMPTY_NESTER_FLAG",
+        "children": null
+    },
+    {
+        "label": "失智老人",
+        "value": "DEMENTED_FLAG",
+        "children": null
+    },
+        ]
+    },
+    {
+        "label": "低保人员",
+        "value": "SUBSISTENCE_ALLOWANCE_FLAG",
+        "children": null
+    },
+   
+    {
+        "label": "保障房人员",
+        "value": "ENSURE_HOUSE_FLAG",
+        "children": null
+    },
+    {
+        "label": "退役军人",
+        "value": "VETERAN_FLAG",
+        "children": null
+    },
+    {
+        "label": "育龄妇女",
+        "value": "FERTILE_WOMAN_FLAG",
+        "children": null
+    },
+    {
+        "label": "特扶人员",
+        "value": "SPECIAL_SUPPORT_FLAG",
+        "children": null
+    }
+],
       itemList,
       fixedList: [],
       constForm,
+      partyList: [
+        {
+          label: '群众',
+          value: 0
+        },
+        {
+          label: '党员',
+          value: 1
+        },
+        {
+          label: '共青团员',
+          value: 2
+        }
+      ],
+      resiHouseRelList: [
+        {
+          label: '自住',
+          value: 0
+        },
+        {
+          label: '租住',
+          value: 1
+        }
+      ],
+      healthStatusList: [
+        {
+          label: '残疾',
+          value: 'DISABILITY_FLAG'
+        },
+        {
+          label: '大病',
+          value: 'SERIOUS_ILLNESS_FLAG'
+        },
+        {
+          label: '慢病',
+          value: 'CHRONIC_DISEASE_FLAG'
+        }
+      ],
+      projectStaffList: [
+      {
+          label: '志愿者',
+          value: 'VOLUNTEER_FLAG'
+        },
+        {
+          label: '楼长',
+          value: 'BUILDING_CHIEF_FLAG'
+        },
+        {
+          label: '单元长',
+          value: 'UNIT_CHIEF_FLAG'
+        },
+        {
+          label: '公益岗',
+          value: 'PUBLIC_WELFARE_FLAG'
+        }
+      ],
+      specialCategoryList: [
+        {
+          label: "安置帮教",
+          value: "anzhibangjiao",
+          children: null
+        },
+        {
+          label: "吸毒人员",
+          value: "xidurenyuan",
+          children: null
+        },
+        {
+          label: "社区矫正",
+          value: "shequjiaozheng",
+          children: null
+        },
+        {
+          label: "不良青少年",
+          value: "buliangqingshaonian",
+          children: null
+        },
+        {
+          label: "肇事肇祸精神病",
+          value: "zhaoshizhaohuojingshenbing",
+          children: null
+        },
+        {
+          label: "邪教人员",
+          value: "xiejiaorenyuan",
+          children: null
+        },
+      ],
+      careerStatusList: [],
       form: {
         name: '',
         mobile: '',
@@ -368,6 +420,8 @@ export default {
         birthdayEnd: '',
         ageStart: '',
         ageEnd: '',
+        integrityScoreFrom: null,//居民信息完整度はじめ
+        integrityScoreTo: null,//居民信息完整度end
         gender: '',
         cultureLevel: '',
         localResidenceFlag: '',
@@ -379,12 +433,15 @@ export default {
         unitId: '',
         gridId: '',
         villageId: '',
-        categoryKey: [],
+        attentionCrowds: [],
+        healthStatus: [],
+        nationality: '',
+        resiHouseRel: '',
+        partyFlag: '',
+        updateTimeStart: '',
+        updateTimeEnd: '',
+        specialCategoryCodes: [],
         remark: '',
-        villageId: '',
-        buildId: '',
-        unitId: '',
-        homeId: '',
         level: '',
         orgType: ''
       },
@@ -394,7 +451,7 @@ export default {
         shortcuts: [
           {
             text: '最近一周',
-            onClick (picker) {
+            onClick(picker) {
               const end = new Date()
               const start = new Date()
               start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
@@ -403,7 +460,7 @@ export default {
           },
           {
             text: '最近一个月',
-            onClick (picker) {
+            onClick(picker) {
               const end = new Date()
               const start = new Date()
               start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
@@ -412,7 +469,7 @@ export default {
           },
           {
             text: '最近三个月',
-            onClick (picker) {
+            onClick(picker) {
               const end = new Date()
               const start = new Date()
               start.setTime(start.getTime() - 3600 * 1000 * 24 * 90)
@@ -518,11 +575,11 @@ export default {
           }
         }
       },
-      optionsVPageNo:1
+      optionsVPageNo: 1
     }
   },
   computed: {
-    sliceList () {
+    sliceList() {
       return function (data, count) {
         // 接收
         if (data !== undefined) {
@@ -540,19 +597,19 @@ export default {
         }
       }
     },
-    changeVDisabled () {
+    changeVDisabled() {
       return !this.form.villageId
     },
-    changeBDisabled () {
+    changeBDisabled() {
       return !this.form.buildId
     },
-    changeDDisabled () {
+    changeDDisabled() {
       return !this.form.unitId
     },
   },
   watch: {
     form: {
-      handler (val, val2) {
+      handler(val, val2) {
         // console.log('valpppp----', val, val2)
         for (let n in val) {
           if (this.constForm[n] !== val[n]) {
@@ -565,7 +622,7 @@ export default {
       deep: true
     },
     timer: {
-      handler (newVal) {
+      handler(newVal) {
         this.handelWatchStartDate(newVal)
       },
       deep: true,
@@ -573,7 +630,6 @@ export default {
     }
   },
   directives: {
-    //这个是写到data外面 与mounted同级
     "el-select-loadmore": {
       bind(el, binding) {
         const SELECTWRAP_DOM = el.querySelector(
@@ -589,55 +645,56 @@ export default {
       },
     },
   },
-  created () {
+  created() {
     // this.initForm()
     // console.log('formcccc---', this.form)
     this.getOrgTreeList()
-    this.getGridList()
     this.getEducation()
     this.getValiheList()
     this.getDictList()
     this.getHousehold()
-    this.getResident()
+    this.getNationality()
+    this.getCareerStatus()
     if (this.columnName) this.handleChangeForm(this.columnName)
   },
   methods: {
-    handleSmartSearch () {
+ 
+    handleSmartSearch() {
       this.showSmartSearchForm = !this.showSmartSearchForm
     },
-    handelSelSmartBtn (index) {
+    handelSelSmartBtn(index) {
 
       this.selBtnIndex = index
     },
-    handelWatchStartDate (val) {
+    handelWatchStartDate(val) {
       return val
     },
-    initForm () {
+    initForm() {
       this.formList.forEach((item) => {
         this.$set(this.form, item.columnName, '')
       })
       console.log('formcccc---', this.form)
     },
-    computdSpan (len) {
+    computdSpan(len) {
       return len == 1 ? 24 : 6
     },
-    handleClearVillage () {
+    handleClearVillage() {
       this.form.buildId = ''
       this.form.homeId = ''
     },
-    handleClearBuild () {
+    handleClearBuild() {
       this.form.buildId = ''
       this.form.unitId = ''
       this.form.homeId = ''
     },
-    handleClearDan () {
+    handleClearDan() {
       this.form.unitId = ''
       this.form.homeId = ''
     },
-    handleSearchFrom () {
+    handleSearchFrom() {
       this.$emit('handleSearchFrom', '')
     },
-    resetForm (formName) {
+    resetForm(formName) {
       for (const n in this.form) {
         if (n == 'age') {
           this.form.age = {
@@ -709,16 +766,29 @@ export default {
     //   }
 
     // },
-    handleAgeChange () {
-      console.log(11 > 5);
-      console.log(11 > 10);
-      if (this.form.ageStart) {
+    handleAgeChange() {
+      if (this.form.ageStart&&this.form.ageEnd) {
         if (this.form.ageStart > this.form.ageEnd) {
           this.$message.warning('结束年龄不能小于开始年龄')
         }
       }
     },
-    handleChangeAgency (val) {
+    informationChange(val,type) {
+      if(isNaN(val)){
+        this.$message.warning('请输入数字');
+        if(type === 'from'){
+          this.form.integrityScoreFrom = null;
+        }else{
+          this.form.integrityScoreTo = null;
+        }
+      }
+      if (this.form.integrityScoreFrom&&this.form.integrityScoreTo) {
+        if (this.form.integrityScoreFrom > this.form.integrityScoreTo) {
+          this.$message.warning('结束分数不能小于开始分数')
+        }
+      }
+    },
+    handleChangeAgency(val) {
 
       this.sarr = []
       const map = new Map();
@@ -732,7 +802,7 @@ export default {
 
       this.getValiheList()
     },
-    getLastItem (list, vals, key) {
+    getLastItem(list, vals, key) {
       let LIST = list || [];
       for (let item of LIST) {
         // console.log(item[key]);
@@ -745,7 +815,8 @@ export default {
         }
       }
     },
-    handleChangeGrid (val) {
+
+    handleChangeGrid(val) {
       console.log('val', val)
       this.form.villageId = ''
       this.form.buildId = ''
@@ -753,26 +824,26 @@ export default {
       this.form.homeId = ''
       this.getValiheList()
     },
-    handleChangeV (val) {
+    handleChangeV(val) {
       console.log('小区val', val)
       this.form.buildId = ''
       this.form.unitId = ''
       this.form.homeId = ''
       this.getBuildList()
     },
-    handleChangeB (val) {
+    handleChangeB(val) {
       console.log('楼号val', val)
       this.form.unitId = ''
       this.form.homeId = ''
       this.getUniList()
     },
-    handleChangeD (val) {
+    handleChangeD(val) {
       console.log('单元val', val)
       this.form.homeId = ''
       this.getHouseList()
     },
     // 监听基础form
-    handleChangeForm (val) {
+    handleChangeForm(val) {
       for (let n in this.fixedForm) {
         if (n === val) {
           if (this.fixedList.length > 0) {
@@ -811,7 +882,7 @@ export default {
         if (item.columnName === val) item.isChange = true
       })
     },
-    getOrgTreeList () {
+    getOrgTreeList() {
       this.$http
         .post('/gov/org/customeragency/agencygridtree', {})
         .then(({ data: res }) => {
@@ -827,27 +898,12 @@ export default {
           return this.$message.error('网络错误')
         })
     },
-    getGridList () {
-      const { user } = this.$store.state
-      this.$http
-        .post('/gov/org/customergrid/gridoption', { agencyId: user.agencyId, purpose: 'addorupdate' })
-        .then(({ data: res }) => {
-          if (res.code !== 0) {
-            return this.$message.error(res.msg)
-          } else {
-            console.log('获取查询详情成功', res.data)
-            this.optionsG = res.data
-          }
-        })
-        .catch(() => {
-          return this.$message.error('网络错误')
-        })
-    },
+
     loadmore() {
       this.optionsVPageNo++;
       this.getValiheList();
     },
-    getValiheList () {
+    getValiheList() {
       const { user } = this.$store.state
       var agencyIdTemp = ''
       if (this.form.agencyId.length == 0) {
@@ -858,16 +914,16 @@ export default {
       var gridIdQuery = '';
       var agencyIdQuery = this.form.agencyId[0];
       if (this.form.agencyId.length >= 2) {
-         agencyIdQuery= this.form.agencyId[this.form.agencyId.length - 2];
-         gridIdQuery = this.form.agencyId[this.form.agencyId.length - 1];
+        agencyIdQuery = this.form.agencyId[this.form.agencyId.length - 2];
+        gridIdQuery = this.form.agencyId[this.form.agencyId.length - 1];
       }
-      
+
       this.$http
         .post('/actual/base/communityQuarters/listQuartersOptions', {
           gridId: gridIdQuery,
           agencyId: agencyIdQuery,
           pageNo: this.optionsVPageNo,
-          pageSize:20
+          pageSize: 20
           // agencyId: user.agencyId
         })
         .then(({ data: res }) => {
@@ -882,7 +938,7 @@ export default {
           return this.$message.error('网络错误')
         })
     },
-    getBuildList () {
+    getBuildList() {
       this.$http
         .post('/actual/base/communityBuilding/buildingoption', {
           quartersId: this.form.villageId
@@ -899,7 +955,7 @@ export default {
           return this.$message.error('网络错误')
         })
     },
-    getUniList () {
+    getUniList() {
       this.$http
         .post('/actual/base/communityBuildingUnit/unitoption', {
           buildingId: this.form.buildId
@@ -916,9 +972,9 @@ export default {
           return this.$message.error('网络错误')
         })
     },
-    getHouseList () {
+    getHouseList() {
       this.$http
-        .post('/actual/base/communityHouse/houseoption', { buildingId: this.form.buildId,unitId: this.form.unitId })
+        .post('/actual/base/communityHouse/houseoption', { buildingId: this.form.buildId, unitId: this.form.unitId })
         .then(({ data: res }) => {
           if (res.code !== 0) {
             return this.$message.error(res.msg)
@@ -931,7 +987,7 @@ export default {
           return this.$message.error('网络错误')
         })
     },
-    getTreeData (data) {
+    getTreeData(data) {
       if (!Array.isArray(data)) return [];
       let arr = data.map((item) => {
         let _item = {};
@@ -946,7 +1002,7 @@ export default {
       });
       return arr;
     },
-    async getEducation () {
+    async getEducation() {
       try {
         let { data } = await this.$http.post('sys/dict/data/education', { formCode: "resi_base_info" })
         data.data = this.getTreeData(data.data)
@@ -957,7 +1013,7 @@ export default {
       }
 
     },
-    async getDictList () {
+    async getDictList() {
       try {
         const { data } = await this.$http.post('sys/dict/data/nation', { formCode: "resi_base_info" })
         this.nation = data.data
@@ -967,23 +1023,33 @@ export default {
       }
 
     },
-    async getHousehold () {
+    async getNationality() {
       try {
-        const { data } = await this.$http.post('sys/dict/data/dictlist', { 'dictType': 'household_situation' })
-        this.household = data.data
+        const { data } = await this.$http.post('sys/dict/data/dictlist', { 'dictType': 'nationality' })
+        this.nationalityList = data.data
       } catch (error) {
-        console.log(error, '获取人户状况字典');
+        console.log(error, '获取国籍字典');
       }
     },
-    async getResident () {
+    async getCareerStatus() {
       try {
-        const { data } = await this.$http.post('sys/dict/data/dictlist', { 'dictType': 'resident_category' })
-        this.resiClass = data.data
+        const { data } = await this.$http.post('sys/dict/data/dictlist', { 'dictType': 'career_status' })
+        this.careerStatusList = data.data
       } catch (error) {
-        console.log(error, '获取居民类别字典');
+        console.log(error, '获取国籍字典');
       }
     },
-    computedBirth (age) {
+
+    async getHousehold() {
+      try {
+        const { data } = await this.$http.post('sys/dict/data/dictlist', { 'dictType': 'household_situation' })
+        this.household = data.data
+      } catch (error) {
+        console.log(error, '获取人户状况字典');
+      }
+    },
+  
+    computedBirth(age) {
       let now = new Date();
       let nowYear = now.getFullYear();
       let nowMonth = now.getMonth() + 1;
@@ -997,7 +1063,7 @@ export default {
       }
       return subYear + '-' + nowMonth + '-' + nowDay
     },
-    computedBirth1 (age) {
+    computedBirth1(age) {
       let now = new Date();
       let nowYear = now.getFullYear();
       let nowMonth = now.getMonth() + 1;
@@ -1010,6 +1076,13 @@ export default {
         nowDay = '0' + nowDay
       }
       return subYear - 1 + '-' + nowMonth + '-' + nowDay
+    },
+    handelClickBasicType() {
+      this.form.name = '';
+      this.form.mobile = '';
+      this.form.idNum = '';
+      this.form.nativePlace = '';
+      this.form.remark = '';
     }
   }
 }
@@ -1022,8 +1095,10 @@ export default {
   display: flex;
   flex-wrap: wrap;
 }
+
 .resi-search {
   padding-bottom: 14px;
+
   .el-col {
     text-align: right;
   }
@@ -1041,25 +1116,31 @@ export default {
     text-align: right;
     // line-height: 32;
   }
+
   .resi-cell-label1 {
     width: max-content;
   }
+
   .resi-cell-value-radio {
     display: flex;
     align-items: center;
     min-height: 32px;
   }
+
   .resi-cell-input {
     max-width: 200px;
   }
+
   .resi-cell--daterange {
     max-width: 240px;
   }
+
   .el-form--inline {
     ::v-deep .el-form-item {
       margin-right: 0px !important;
     }
   }
+
   .resi-cell-select {
     max-width: 200px;
     box-sizing: border-box;
@@ -1067,10 +1148,12 @@ export default {
     &-middle {
       width: 130px;
     }
+
     &-small {
       width: 88px;
     }
   }
+
   .resi-cell-select:last-child {
     margin-right: 0;
   }
diff --git a/src/views/components/resiTransfer.vue b/src/views/components/resiTransfer.vue
index f92bcf533..4947fc38a 100644
--- a/src/views/components/resiTransfer.vue
+++ b/src/views/components/resiTransfer.vue
@@ -17,7 +17,7 @@
                       prop="type"
                       label-width="150px"
                       style="display: block">
-          <el-radio-group v-model="dataForm.type">
+          <el-radio-group v-model.trim="dataForm.type">
 
             <el-radio :label="'in'">{{'迁往'+rootAgency.organizationName+'内其他区域'}}</el-radio>
             <el-radio :label="'out'">其他</el-radio>
@@ -30,7 +30,7 @@
                         prop='newAgencyId'
                         label-width="150px">
             <el-cascader ref="myCascader"
-                         v-model="agencyIdArray"
+                         v-model.trim="agencyIdArray"
                          style="width:480px"
                          :key="iscascaderShow"
                          :options="casOptions"
@@ -106,7 +106,7 @@
                     resize="none"
                     style="width:600px"
                     placeholder='请输入备注'
-                    v-model="dataForm.remark">
+                    v-model.trim="dataForm.remark">
           </el-input>
         </el-form-item>
       </el-form>
diff --git a/src/views/components/scoreRecord.vue b/src/views/components/scoreRecord.vue
index 96c6d3ba7..891bfc447 100644
--- a/src/views/components/scoreRecord.vue
+++ b/src/views/components/scoreRecord.vue
@@ -8,7 +8,7 @@
 
       <el-form-item label="查询时间"
                     prop="startTime">
-        <el-date-picker v-model="timeRange"
+        <el-date-picker v-model.trim="timeRange"
                         type="daterange"
                         :clearable="false"
                         :picker-options="pickerOptions"
diff --git a/src/views/components/smartSearchRule.vue b/src/views/components/smartSearchRule.vue
index 755ba6755..89944ad17 100644
--- a/src/views/components/smartSearchRule.vue
+++ b/src/views/components/smartSearchRule.vue
@@ -6,7 +6,7 @@
            :key="ruleIndex">
         <div class="row-item">
           <el-select class="item_width_1"
-                     v-model="ruleItem.selSmartType"
+                     v-model.trim="ruleItem.selSmartType"
                      size="small"
                      placeholder="请选择">
             <el-option v-for="item in smartList"
@@ -21,7 +21,7 @@
                class="row-item-one">
 
             <el-select class="item_width_1"
-                       v-model="ruleItem.houseRule.colKey"
+                       v-model.trim="ruleItem.houseRule.colKey"
                        size="small"
                        placeholder="请选择">
               <el-option v-for="item in houseItemList"
@@ -32,7 +32,7 @@
               </el-option>
             </el-select>
             <el-select class="item_width_1"
-                       v-model="ruleItem.houseRule.queryType"
+                       v-model.trim="ruleItem.houseRule.queryType"
                        size="small"
                        placeholder="请选择">
               <el-option v-for="item in queryList"
@@ -46,7 +46,7 @@
 
               <el-select v-if="ruleItem.houseRule.colType==='select'||ruleItem.houseRule.colType==='radio'||ruleItem.houseRule.colType==='checkbox'"
                          class="item_width_2"
-                         v-model="ruleItem.houseRule.colVal"
+                         v-model.trim="ruleItem.houseRule.colVal"
                          size="small"
                          placeholder="请选择">
                 <el-option v-for="item in ruleItem.houseRule.colOption"
@@ -58,12 +58,12 @@
               </el-select>
               <el-input-number v-else-if="ruleItem.houseRule.colType==='inputNum'"
                                class="item_width_2"
-                               v-model="ruleItem.houseRule.colVal"
+                               v-model.trim="ruleItem.houseRule.colVal"
                                :min="0"
                                size="small"
                                label="请输入"></el-input-number>
               <el-date-picker v-else-if="ruleItem.houseRule.colType==='datepicker'||ruleItem.houseRule.colType==='date'"
-                              v-model="ruleItem.houseRule.colVal"
+                              v-model.trim="ruleItem.houseRule.colVal"
                               class="item_width_2"
                               type="datetime"
                               size="small"
@@ -75,7 +75,7 @@
                         class="item_width_2"
                         size="small"
                         placeholder="请输入"
-                        v-model="ruleItem.houseRule.colVal">
+                        v-model.trim="ruleItem.houseRule.colVal">
               </el-input>
             </div>
 
@@ -85,7 +85,7 @@
                class="row-item-one">
 
             <el-select class="item_width_1"
-                       v-model="ruleItem.personRule.itemGroupId"
+                       v-model.trim="ruleItem.personRule.itemGroupId"
                        size="small"
                        placeholder="请选择">
               <el-option v-for="item in groupList"
@@ -96,7 +96,7 @@
               </el-option>
             </el-select>
             <el-select class="item_width_1"
-                       v-model="ruleItem.personRule.itemId"
+                       v-model.trim="ruleItem.personRule.itemId"
                        size="small"
                        placeholder="请选择">
               <el-option v-for="item in ruleItem.personRule.itemList"
@@ -107,7 +107,7 @@
               </el-option>
             </el-select>
             <el-select class="item_width_1"
-                       v-model="ruleItem.personRule.queryType"
+                       v-model.trim="ruleItem.personRule.queryType"
                        size="small"
                        placeholder="请选择">
               <el-option v-for="item in queryList"
@@ -121,7 +121,7 @@
 
               <el-select v-if="ruleItem.personRule.colType==='select'||ruleItem.personRule.colType==='radio'||ruleItem.personRule.colType==='checkbox'"
                          class="item_width_2"
-                         v-model="ruleItem.personRule.colVal"
+                         v-model.trim="ruleItem.personRule.colVal"
                          size="small"
                          placeholder="请选择">
                 <el-option v-for="item in ruleItem.personRule.colOption"
@@ -133,13 +133,13 @@
               </el-select>
               <el-input-number v-else-if="ruleItem.personRule.colType==='inputNum'"
                                class="item_width_2"
-                               v-model="ruleItem.personRule.colVal"
+                               v-model.trim="ruleItem.personRule.colVal"
                                :min="0"
                                size="small"
                                label="请输入"></el-input-number>
 
               <el-date-picker v-else-if="ruleItem.personRule.colType==='datepicker'||ruleItem.personRule.colType==='date'"
-                              v-model="ruleItem.personRule.colVal"
+                              v-model.trim="ruleItem.personRule.colVal"
                               class="item_width_2"
                               type="datetime"
                               value-format="yyyy-MM-dd HH:mm:ss"
@@ -150,7 +150,7 @@
                         class="item_width_2"
                         size="small"
                         placeholder="请输入"
-                        v-model="ruleItem.personRule.colVal">
+                        v-model.trim="ruleItem.personRule.colVal">
               </el-input>
 
             </div>
@@ -159,7 +159,7 @@
 
           <el-select v-if="ruleIndex<(smartRuleList.length-1)"
                      class="item_width_1"
-                     v-model="ruleItem.nextLogicalRel"
+                     v-model.trim="ruleItem.nextLogicalRel"
                      size="small"
                      placeholder="请选择">
             <el-option v-for="item in logicalList"
diff --git a/src/views/components/tinymce/example/Index.vue b/src/views/components/tinymce/example/Index.vue
index 36c836c5e..5e42bab90 100644
--- a/src/views/components/tinymce/example/Index.vue
+++ b/src/views/components/tinymce/example/Index.vue
@@ -1,6 +1,6 @@
 <template>
     <div>
-        <Tinymce v-model="defaultValue" :height="300" placeholder="在这里输入文字" />
+        <Tinymce v-model.trim="defaultValue" :height="300" placeholder="在这里输入文字" />
     </div>
 </template>
 
diff --git a/src/views/components/tinymce2/index.vue b/src/views/components/tinymce2/index.vue
index 89323c172..ebb75b104 100644
--- a/src/views/components/tinymce2/index.vue
+++ b/src/views/components/tinymce2/index.vue
@@ -1,6 +1,6 @@
 <template>
-  <editor :id="id" v-model="content" tag-name="div" :init="init" />
-  <!-- <textarea id="editors" v-model="content" /> -->
+  <editor :id="id" v-model.trim="content" tag-name="div" :init="init" />
+  <!-- <textarea id="editors" v-model.trim="content" /> -->
 </template>
 
 <script>
diff --git a/src/views/dataBoard/cpts/details/jmxq.vue b/src/views/dataBoard/cpts/details/jmxq.vue
index f6b2cac28..ff0217dc1 100644
--- a/src/views/dataBoard/cpts/details/jmxq.vue
+++ b/src/views/dataBoard/cpts/details/jmxq.vue
@@ -190,7 +190,7 @@ export default {
 }
 
 .eventWrap {
-  width: 1094px;
+  // width: 1094px;
   height: 798px;
   overflow-y: auto;
   overflow-x: hidden;
diff --git a/src/views/dataBoard/cpts/details/smyd.vue b/src/views/dataBoard/cpts/details/smyd.vue
index e2cf0d45c..de16f799f 100644
--- a/src/views/dataBoard/cpts/details/smyd.vue
+++ b/src/views/dataBoard/cpts/details/smyd.vue
@@ -207,7 +207,7 @@ export default {
 }
 
 .eventWrap {
-  width: 1094px;
+  // width: 1094px;
   max-height: 798px;
   overflow-y: auto;
   overflow-x: hidden;
diff --git a/src/views/dataBoard/cpts/details/xqwmz.vue b/src/views/dataBoard/cpts/details/xqwmz.vue
index 1a8fd95ff..c69a4bc89 100644
--- a/src/views/dataBoard/cpts/details/xqwmz.vue
+++ b/src/views/dataBoard/cpts/details/xqwmz.vue
@@ -291,7 +291,7 @@ export default {
 }
 
 .eventWrap {
-  width: 1094px;
+  // width: 1094px;
   max-height: 798px;
   overflow-y: auto;
   overflow-x: hidden;
diff --git a/src/views/dataBoard/cpts/details/yxwxfw.vue b/src/views/dataBoard/cpts/details/yxwxfw.vue
index a083839a6..d7654baae 100644
--- a/src/views/dataBoard/cpts/details/yxwxfw.vue
+++ b/src/views/dataBoard/cpts/details/yxwxfw.vue
@@ -30,7 +30,8 @@
             </div>
             <div class="eventItem">
               <span>所属组织：</span>
-              <span>{{ formData.principalName }}</span>
+              <span v-if="formData.gridIdList &&formData.gridIdList.length!=0 ">{{ formData.gridIdList[0].objectName }}</span>
+              <span v-else> -- </span>
             </div>
             <div class="eventItem">
               <span>服务类型：</span>
@@ -99,7 +100,7 @@ export default {
       item: {},
       loading: false,
       loading1: false,
-      activities: [],
+      // activities: [],
       zuziTypes: {
         community_org: "社区自组织",
         ic_user_volunteer: "志愿者",
@@ -180,16 +181,16 @@ export default {
             this.$message.error(msg);
           }
         });
-      this.$http
-        .post("/governance/icEvent/process", { icEventId: id })
-        .then((res) => {
-          const { code, data, msg } = res.data;
-          if (code === 0) {
-            this.activities = data;
-          } else {
-            this.$message.error(msg);
-          }
-        });
+      // this.$http
+      //   .post("/governance/icEvent/process", { icEventId: id })
+      //   .then((res) => {
+      //     const { code, data, msg } = res.data;
+      //     if (code === 0) {
+      //       this.activities = data;
+      //     } else {
+      //       this.$message.error(msg);
+      //     }
+      //   });
     },
   },
 };
@@ -225,7 +226,6 @@ export default {
   font-size: 14px !important;
 }
 .eventWrap {
-  width: 1094px;
   max-height: 798px;
   overflow-y: auto;
   overflow-x: hidden;
diff --git a/src/views/dataBoard/cpts/event-details.vue b/src/views/dataBoard/cpts/event-details.vue
index 5f3fe4567..dbccfe7bc 100644
--- a/src/views/dataBoard/cpts/event-details.vue
+++ b/src/views/dataBoard/cpts/event-details.vue
@@ -221,6 +221,10 @@ export default {
       type: Boolean,
       default: false,
     },
+    formType: {
+      type: String,
+      default: false,
+    },
   },
 
   data() {
@@ -267,7 +271,7 @@ export default {
     getDetailsData(id) {
       this.loading = true;
       this.$http
-          .post("/governance/icEvent/detail", {icEventId: id})
+          .post(`/governance/${this.formType == '12345'?'icEvent':'icEventOld'}/detail`, {icEventId: id})
           .then((res) => {
             const {code, data, msg} = res.data;
             if (code === 0) {
@@ -279,10 +283,9 @@ export default {
             }
           });
     },
-
     getProcessData(id) {
       this.$http
-          .post("/governance/icEvent/process", {icEventId: id})
+          .post(`/governance/${this.formType == '12345'?'icEvent':'icEventOld'}/process`, {icEventId: id})
           .then((res) => {
             const {code, data, msg} = res.data;
             if (code === 0) {
diff --git a/src/views/dataBoard/cpts/family/modules/BusinessRecords.vue b/src/views/dataBoard/cpts/family/modules/BusinessRecords.vue
index 32f6b78bf..cb064e8e4 100644
--- a/src/views/dataBoard/cpts/family/modules/BusinessRecords.vue
+++ b/src/views/dataBoard/cpts/family/modules/BusinessRecords.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="business-records">
-    <Tabs v-model="type" :list="typeList" @changeVal="typeChange" />
+    <Tabs v-model.trim="type" :list="typeList" @changeVal="typeChange" />
     <complaint @changeTotal="changeTotal" :juminArr="juminArr" v-show="type == 1" />
     <economize @changeTotal="changeTotal" :juminArr="juminArr" v-show="type == 2" />
     <community @changeTotal="changeTotal" :juminArr="juminArr" v-show="type == 3" />
diff --git a/src/views/dataBoard/cpts/family/modules/businessTables/reporting-events.vue b/src/views/dataBoard/cpts/family/modules/businessTables/reporting-events.vue
index 493ad3932..89fe01f97 100644
--- a/src/views/dataBoard/cpts/family/modules/businessTables/reporting-events.vue
+++ b/src/views/dataBoard/cpts/family/modules/businessTables/reporting-events.vue
@@ -22,7 +22,7 @@
 </template>
 
 <script>
-import eventDetails from "../../../event-details.vue";
+import eventDetails from "../../../old-event-details.vue";
 export default {
   name: "reporting-events",
   components: {
diff --git a/src/views/dataBoard/cpts/homeDetails/index.vue b/src/views/dataBoard/cpts/homeDetails/index.vue
index 032dceb4d..f8dc49551 100644
--- a/src/views/dataBoard/cpts/homeDetails/index.vue
+++ b/src/views/dataBoard/cpts/homeDetails/index.vue
@@ -16,7 +16,7 @@
     <el-select
         popper-class="selectPopClass"
         clearable
-        v-model="buildingId"
+        v-model.trim="buildingId"
         size="small"
         placeholder="请选择楼栋"
         @change="getList"
@@ -202,7 +202,7 @@
             <el-select
               popper-class="selectPopClass"
               clearable
-              v-model="queryParams.residentTag"
+              v-model.trim="queryParams.residentTag"
               size="small"
               placeholder="居民类型"
             >
@@ -217,7 +217,7 @@
             <el-select
               popper-class="selectPopClass"
               clearable
-              v-model="queryParams.riskyFlag"
+              v-model.trim="queryParams.riskyFlag"
               size="small"
               placeholder="满意度风险家庭"
             >
diff --git a/src/views/dataBoard/cpts/map/popup.vue b/src/views/dataBoard/cpts/map/popup.vue
index 1b799b4cd..ac622b6c3 100644
--- a/src/views/dataBoard/cpts/map/popup.vue
+++ b/src/views/dataBoard/cpts/map/popup.vue
@@ -17,7 +17,7 @@
 
 				<div class="item">
 					<span class="field">姓名：</span>
-					<span>{{ info.user_name || "--" }}</span>
+					<span>{{ info.name || "--" }}</span>
 				</div>
 				<div class="item">
 					<span class="field">所属网格：</span>
@@ -34,7 +34,7 @@
 				</div>
 				<div class="item">
 					<span class="field">性别：</span>
-					<span>{{ info.genderShow || "--" }}</span>
+					<span>{{ info.gender === null?'--' : info.gender === 1 ? '男' : info.gender === 2 ? '女' : '位置' }}</span>
 				</div>
 
 				<div class="item">
diff --git a/src/views/dataBoard/cpts/old-event-details.vue b/src/views/dataBoard/cpts/old-event-details.vue
new file mode 100644
index 000000000..6f95e82be
--- /dev/null
+++ b/src/views/dataBoard/cpts/old-event-details.vue
@@ -0,0 +1,373 @@
+<template>
+  <el-dialog
+      width="1118px"
+      :modal="true"
+      :modal-append-to-body="false"
+      :destroy-on-close="true"
+      :visible="showDialog"
+      @close="handleClose"
+
+  >
+    <div class="eventWrap"
+         v-loading="loading"
+         element-loading-text="加载中"
+         element-loading-spinner="el-icon-loading"
+         element-loading-background="rgba(0, 0, 0, 0.5)"
+    >
+      <el-row :gutter="32">
+        <el-col :span="24" style="padding-left: 40px">
+          <title-box text="事件详情"/>
+        </el-col>
+        <el-col
+            :span="13"
+            style="padding-left: 40px"
+
+        >
+          <div class="leftEvent">
+            <div class="eventDetails">
+              <img
+                  :width="18"
+                  :height="18"
+                  src="@/assets/images/manyidu/tc-title-icon.png"
+              />事项详情
+            </div>
+            <div class="eventItem">
+              <span>所属组织：</span>
+              <span>{{ item.gridName }}</span>
+            </div>
+            <div class="eventItem">
+              <span>上报渠道：</span>
+              <span>{{ item.sourceTypeName }}</span>
+            </div>
+            <div class="eventItem">
+              <span>事件类型：</span>
+              <span>{{ item.categoryName }}</span>
+            </div>
+            <div class="eventItem">
+              <span>接受时间：</span>
+              <span>{{ item.happenTime }}</span>
+            </div>
+            <!--            <div class="eventItem">
+                          <span>工单号：</span>
+                          <span>{{ item.workOrderNum }}</span>
+                        </div>-->
+            <div class="eventItem">
+              <div>问题描述：</div>
+              <div style="margin-top: 20px">{{ item.eventContent }}</div>
+            </div>
+            <!--            <div class="eventItem">
+                          <div>图片：</div>
+                          <div style="margin-top: 20px; display: flex">
+                            <img
+                              style="width: 100px; height: 100px; margin-right: 5px"
+                              v-for="src in item.imageList"
+                              :key="src"
+                              :src="src"
+                              alt="/"
+                              @click="openImg(src)"
+                            />
+                          </div>
+                        </div>-->
+            <div class="eventItem">
+              <span>联系人：</span>
+              <span>{{ item.name }}</span>
+            </div>
+            <div class="eventItem">
+              <span>联系电话：</span>
+              <span>{{ item.mobile }}</span>
+            </div>
+            <div class="eventItem">
+              <span>详细地址：</span>
+              <span>{{ item.address }}</span>
+            </div>
+            <div class="eventItem">
+              <span>办结时限：</span>
+              <span>{{ item.latestOperatedTime }}</span>
+            </div>
+            <div class="eventItem">
+              <span>满意度评价：</span>
+              <span>{{ item.satisfactionName }}</span>
+            </div>
+          </div>
+        </el-col>
+        <el-col
+            :span="11"
+        >
+          <div class="rightEvent m-info">
+            <div class="eventDetails">
+              <img
+                  :width="18"
+                  :height="18"
+                  src="@/assets/images/manyidu/tc-title-icon.png"
+              />办理进展
+            </div>
+            <!-- <el-timeline class="timeline" :reverse="true">
+                <el-timeline-item v-for="(item, index) in activities" :key="index" :class="index == activities.length - 1 ? 'sucess' : ''">
+                  <div class="status-box">
+                    <div class="status1" v-if="index == activities.length - 1">回复</div>
+                    <div class="status2" v-else>完成并回复</div>
+                    <div class="timestamp">{{ item.timeLimit ? $moment(item.timeLimit).format("YYYY-MM-DD hh:mm:ss") : "" }}</div>
+                  </div>
+                  <div class="content">
+                    <div class="field">回复人：</div>
+                    <div class="value">{{ item.departmentName }}</div>
+                  </div>
+                  <div class="content">
+                    <div class="field">回复内容：</div>
+                    <div class="value">{{ item.publicReply }}</div>
+                  </div>
+                </el-timeline-item>
+              </el-timeline> -->
+            <div v-if="activities.length > 0">
+              <!-- <el-card :class="{ 'box-card': source === 'visiual' }" style="min-height: calc(88vh - 50px); overflow: auto"> -->
+              <div class="m-process">
+                <div class="list">
+                  <div
+                      class="item"
+                      :class="[index === 0 ? 'z-on' : '']"
+                      :key="item.processId"
+                      v-for="(item, index) in activities"
+                  >
+                    <div class="item-row">
+                      <template v-if="item.agencyId">
+                        <div class="name">指派</div>
+                      </template>
+                      <template v-if="!item.timeLimit">
+                        <div class="name">完成并回复</div>
+                      </template>
+                      <template v-if="!item.agencyId && item.timeLimit">
+                        <div class="name">{{ item.processName }}</div>
+                      </template>
+                      <div class="date">
+                        {{
+                          item.processTime ? getTrueTime(item.processTime) : ""
+                        }}
+                      </div>
+                    </div>
+                    <div v-if="item.type === 'event'">
+                      <template v-if="item.agencyId">
+                        <div class="detail">
+                          <div class="detail-field">指派人：</div>
+                          <div class="detail-value">
+                            {{ item.departmentName }}
+                          </div>
+                        </div>
+                        <div class="detail">
+                          <div class="detail-field">指派部门：</div>
+                          <div class="detail-value">
+                            {{ item.agencyName }}
+                          </div>
+                        </div>
+                        <div class="detail">
+                          <div class="detail-field">转办意见：</div>
+                          <div class="detail-value">
+                            {{ item.publicReply }}
+                          </div>
+                        </div>
+                        <div class="detail">
+                          <div class="detail-field">办结时限：</div>
+                          <div class="detail-value">
+                            {{ item.timeLimit }}
+                          </div>
+                        </div>
+                      </template>
+                      <template v-else>
+                        <div class="detail">
+                          <div class="detail-field">回复人：</div>
+                          <div class="detail-value">
+                            {{ item.departmentName }}
+                          </div>
+                        </div>
+                        <div class="detail">
+                          <div class="detail-field">回复内容：</div>
+                          <div class="detail-value">
+                            {{ item.publicReply }}
+                          </div>
+                        </div>
+                        <div class="detail" v-if="item.timeLimit">
+                          <div class="detail-field">办结时限：</div>
+                          <div class="detail-value">
+                            {{ getTrueTime(item.timeLimit) }}
+                          </div>
+                        </div>
+                      </template>
+                    </div>
+                  </div>
+                </div>
+              </div>
+              <!-- </el-card> -->
+            </div>
+          </div>
+        </el-col>
+      </el-row>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import titleBox from "./Title";
+
+export default {
+  name: "ReportAnEvent",
+  components: {
+    titleBox,
+  },
+  props: {
+    id: {
+      type: String,
+      default: "",
+    },
+    showDialog: {
+      type: Boolean,
+      default: false,
+    },
+  },
+
+  data() {
+    return {
+      item: {},
+      loading: false,
+      loading1: false,
+      activities: [],
+    };
+  },
+
+  computed: {},
+  watch: {
+    showDialog: {
+      handler(val) {
+        if (val) {
+          this.getDetailsData(this.id);
+          this.getProcessData(this.id);
+        } else {
+          this.item = {}
+          this.activities = []
+        }
+      },
+      immediate: true,
+    },
+  },
+  mounted() {
+  },
+
+  methods: {
+    handleClose() {
+      this.$emit("close", false);
+      this.item = {};
+    },
+
+    openImg(src) {
+      window.open(src);
+    },
+
+    getTrueTime(time) {
+      return this.$moment(time * 1000).format("YYYY-MM-DD hh:mm");
+    },
+
+    getDetailsData(id) {
+      this.loading = true;
+      this.$http
+          .post("/governance/icEventOLd/detail", {icEventId: id})
+          .then((res) => {
+            const {code, data, msg} = res.data;
+            if (code === 0) {
+              this.item = data;
+              this.loading = false;
+            } else {
+              this.loading = false;
+              this.$message.error(msg);
+            }
+          });
+    },
+
+    getProcessData(id) {
+      this.$http
+          .post("/governance/icEventOLd/process", {icEventId: id})
+          .then((res) => {
+            const {code, data, msg} = res.data;
+            if (code === 0) {
+              this.activities = data;
+              this.loading1 = false;
+            } else {
+              this.loading1 = false;
+              this.$message.error(msg);
+            }
+          });
+    },
+  },
+};
+</script>
+
+<style lang="scss" src="@/assets/scss/dataBoard/popup-info.scss" scoped></style>
+
+<style lang="scss" scoped>
+@import "@/assets/scss/modules/shequzhili/event-info.scss";
+@import "@/assets/scss/dataBoard/dialog.scss";
+
+@mixin fontStyle {
+  color: #fff !important;
+  font-size: 14px !important;
+}
+
+.eventWrap {
+  width: 1094px;
+  //height: 798px;
+  overflow-y: auto;
+  overflow-x: hidden;
+  padding: 24px;
+
+  .eventDetails {
+    font-size: 18px;
+    margin: 48px 24px 48px 0;
+    color: #ffffff;
+
+    img {
+      margin-top: -4px;
+      margin-right: 8px;
+    }
+  }
+
+  .m-info {
+    padding: 0px !important;
+
+    .m-process {
+      margin: 0 !important;
+
+      .name {
+        @include fontStyle;
+      }
+
+      .date {
+        @include fontStyle;
+      }
+
+      .detail {
+        @include fontStyle;
+
+        .detail-field {
+          flex: none !important;
+        }
+      }
+    }
+  }
+
+  .leftEvent {
+    color: #fff;
+
+    .eventItem {
+      font-size: 14px;
+      margin-bottom: 24px;
+
+      span:first-child {
+      }
+
+      span:last-child {
+      }
+    }
+  }
+
+  .rightEvent {
+    color: #fff;
+  }
+}
+</style>
diff --git a/src/views/dataBoard/cpts/personnel/modules/BusinessRecords.vue b/src/views/dataBoard/cpts/personnel/modules/BusinessRecords.vue
index 6864ab5ef..425f16497 100644
--- a/src/views/dataBoard/cpts/personnel/modules/BusinessRecords.vue
+++ b/src/views/dataBoard/cpts/personnel/modules/BusinessRecords.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="business-records">
-    <Tabs v-model="type" :list="typeList" @changeVal="typeChange" />
+    <Tabs v-model.trim="type" :list="typeList" @changeVal="typeChange" />
     <complaint @changeTotal="changeTotal" v-show="type == 1" />
     <economize @changeTotal="changeTotal" v-show="type == 2" />
     <community @changeTotal="changeTotal" v-show="type == 3" />
diff --git a/src/views/dataBoard/cpts/personnel/modules/businessTables/complaint.vue b/src/views/dataBoard/cpts/personnel/modules/businessTables/complaint.vue
index f5c8f03b4..2f615e02e 100644
--- a/src/views/dataBoard/cpts/personnel/modules/businessTables/complaint.vue
+++ b/src/views/dataBoard/cpts/personnel/modules/businessTables/complaint.vue
@@ -17,7 +17,7 @@
       <img width="268px" height="128px" src="~@/assets/images/overview/zanwu.png" />
       <div style="color: #fff">暂无数据</div>
     </div>
-    <eventDetails :showDialog="showDialog" :id="rowId" @close="close" />
+    <eventDetails :showDialog="showDialog" :id="rowId" @close="close" :formType="'12345'" />
     <Pagination
       v-show="total > 0"
       :total="total"
diff --git a/src/views/dataBoard/cpts/personnel/modules/businessTables/reporting-events.vue b/src/views/dataBoard/cpts/personnel/modules/businessTables/reporting-events.vue
index 83eeb74bd..672777c9f 100644
--- a/src/views/dataBoard/cpts/personnel/modules/businessTables/reporting-events.vue
+++ b/src/views/dataBoard/cpts/personnel/modules/businessTables/reporting-events.vue
@@ -23,7 +23,7 @@
       :limit.sync="queryParams.pageSize"
       @pagination="getList"
     />
-    <eventDetails :showDialog="showDialog" :id="this.rowId" @close="close" />
+    <eventDetails :showDialog="showDialog" :formType="'event'" :id="this.rowId" @close="close" />
   </div>
 </template>
 
@@ -45,6 +45,7 @@ export default {
       total: 0,
       rowId: null,
       showDialog: false,
+      
     };
   },
   created() {},
diff --git a/src/views/dataBoard/cpts/resi-details.vue b/src/views/dataBoard/cpts/resi-details.vue
index c7a249a89..a9cf3bb0b 100644
--- a/src/views/dataBoard/cpts/resi-details.vue
+++ b/src/views/dataBoard/cpts/resi-details.vue
@@ -230,7 +230,7 @@
             <img src="@/assets/img/shuju/people/arrow-double-right.png" />
           </div>
         </div>-->
-        <el-tabs v-model="activeName" @tab-click="handleClick">
+        <el-tabs v-model.trim="activeName" @tab-click="handleClick">
           <el-tab-pane label="教育">
             <div class="f-flex f-bto16 f-top24">
               <div class="f-labels">文化程度:</div>
diff --git a/src/views/dataBoard/fifteen/components/index.vue b/src/views/dataBoard/fifteen/components/index.vue
index aa3a98dff..e461619df 100644
--- a/src/views/dataBoard/fifteen/components/index.vue
+++ b/src/views/dataBoard/fifteen/components/index.vue
@@ -2,7 +2,7 @@
     <div id="map">
         <div class="search">
             <el-input placeholder="请输入内容"
-                      v-model="input"
+                      v-model.trim="input"
                       clearable
                       size="medium">
                 <template slot="append">
diff --git a/src/views/dataBoard/organizational/dangTree/index.vue b/src/views/dataBoard/organizational/dangTree/index.vue
index 34724c758..82470089d 100644
--- a/src/views/dataBoard/organizational/dangTree/index.vue
+++ b/src/views/dataBoard/organizational/dangTree/index.vue
@@ -124,7 +124,7 @@ export default {
         [5, "党委"],
         [6, "党总支"],
         [7, "党支部"],
-        [8, "楼院党小组"],
+        [8, "党小组"],
         [9, "党员中心户"],
         [10, "联系家庭"],
       ]);
diff --git a/src/views/dataBoard/organizational/index.vue b/src/views/dataBoard/organizational/index.vue
index 89155f023..498313168 100644
--- a/src/views/dataBoard/organizational/index.vue
+++ b/src/views/dataBoard/organizational/index.vue
@@ -32,7 +32,7 @@ export default {
       levelArr: [1, 2, 3, 4],
       navList: [
         {
-          name: "动力主轴",
+          name: "党委架构",
           key: "1",
           path: "/organizational/dangTree",
         },
@@ -42,424 +42,15 @@ export default {
           path: "/organizational/jwTree",
         },
         {
-          name: "微网格治理",
+          name: "网格架构",
           key: "3",
           path: "/organizational/gridTree",
         },
       ],
-      cardList: [
-        {
-          title: "社区党委",
-          key: "1",
-          name: "南昌路社区党委 （党委书记：解书记）",
-          children: [
-            {
-              title: "网格党支部",
-              name: "第一网格党支部(支部书记：王艺发)",
-              key: "1",
-              children: [
-                {
-                  title: "楼院党小组",
-                  name: "第一楼院党小组 （组长：韩文国）",
-                  key: "1",
-                },
-                {
-                  title: "楼院党小组",
-                  name: "第二楼院党小组 （组长：褚丽兰）",
-                  key: "2",
-                },
-              ],
-            },
-            {
-              title: "网格党支部",
-              name: "第二网格党支部 （支部书记：尤芬紫）",
-              key: "2",
-              children: [
-                {
-                  title: "楼院党小组",
-                  name: "第一楼院党小组 （组长：韩文国）",
-                  key: "1",
-                },
-                {
-                  title: "楼院党小组",
-                  name: "第二楼院党小组 （组长：褚丽兰）",
-                  key: "2",
-                },
-              ],
-            },
-            {
-              title: "网格党支部",
-              name: "第三网格党支部 （支部书记：凤桥强）",
-              key: "3",
-              children: [
-                {
-                  title: "楼院党小组",
-                  name: "第一楼院党小组 （组长：韩文国）",
-                  key: "1",
-                },
-                {
-                  title: "楼院党小组",
-                  name: "第二楼院党小组 （组长：褚丽兰）",
-                  key: "2",
-                },
-                {
-                  title: "楼院党小组",
-                  name: "第三楼院党小组 （组长：王丽丽）",
-                  key: "3",
-                },
-              ],
-            },
-          ],
-        },
-      ],
+      cardList: [],
       nowVal: 100,
 
-      nodeConfig: {
-        partyOrgName: "市北区委",
-        partyOrgLevel: 1,
-        partyOrgPid: "0",
-        principalName: "栾秀杰",
-        laneLevel: 1,
-        children: [
-          {
-            partyOrgName: "市北区委",
-            partyOrgLevel: 2,
-            partyOrgPid: "0",
-            principalName: "栾秀杰",
-            laneLevel: 2,
-            children: [
-              {
-                partyOrgName: "市北区委",
-                partyOrgLevel: 3,
-                partyOrgPid: "0",
-                principalName: "栾秀杰",
-                laneLevel: 3,
-                children: [
-                  {
-                    partyOrgName: "市北区委",
-                    partyOrgLevel: 4,
-                    partyOrgPid: "0",
-                    principalName: "栾秀杰",
-                    laneLevel: 4,
-                    children: [
-                      {
-                        partyOrgName: "市北区委",
-                        partyOrgLevel: 5,
-                        partyOrgPid: "0",
-                        principalName: "栾秀杰",
-                        laneLevel: 5,
-                        children: [
-                          {
-                            partyOrgName: "市北区委",
-                            partyOrgLevel: 6,
-                            partyOrgPid: "0",
-                            principalName: "栾秀杰",
-                            laneLevel: 6,
-                            children: [
-                              {
-                                partyOrgName: "市北区委",
-                                partyOrgLevel: 7,
-                                partyOrgPid: "0",
-                                principalName: "栾秀杰",
-                                laneLevel: 7,
-                                children: [
-                                  {
-                                    partyOrgName: "市北区委",
-                                    partyOrgLevel: 8,
-                                    partyOrgPid: "0",
-                                    principalName: "栾秀杰",
-                                    laneLevel: 8,
-                                    children: [
-                                      {
-                                        partyOrgName: "市北区委",
-                                        partyOrgLevel: 9,
-                                        partyOrgPid: "0",
-                                        principalName: "栾秀杰",
-                                        laneLevel: 9,
-                                        children: [
-                                          {
-                                            partyOrgName: "市北区委",
-                                            partyOrgLevel: 10,
-                                            partyOrgPid: "0",
-                                            principalName: "栾秀杰",
-                                            laneLevel: 10,
-                                          },
-                                        ],
-                                      },
-                                    ],
-                                  },
-                                ],
-                              },
-                            ],
-                          },
-                        ],
-                      },
-                    ],
-                  },
-                ],
-              },
-            ],
-          },
-        ],
-
-        // title: "社区党委",
-        // name: "南昌路社区党委(党委书记：解书记)",
-        // key: "1",
-        // children: [
-        //   {
-        //     title: "网格党支部",
-        //     name: "第一网格党支部 （支部书记：王艺发）",
-        //     type: 2,
-        //     children: [
-        //       {
-        //         title: "楼院党小组",
-        //         type: 3,
-        //         name: "第一楼院党小组 （组长：韩文国）",
-        //         children: [
-        //           {
-        //             title: "党员中心户",
-        //             type: 4,
-        //             name: "周游",
-        //           },
-        //           {
-        //             title: "党员中心户",
-        //             type: 4,
-        //             name: "王阳明",
-        //           },
-        //           {
-        //             title: "党员中心户",
-        //             type: 4,
-        //             name: "刘艳萍",
-        //           },
-        //           {
-        //             title: "党员中心户",
-        //             type: 4,
-        //             name: "谢苗苗",
-        //           },
-        //           {
-        //             title: "党员中心户",
-        //             type: 4,
-        //             name: "杨军",
-        //           },
-        //         ],
-        //       },
-        //       {
-        //         title: "楼院党小组",
-        //         type: 3,
-        //         name: "第二楼院党小组 （组长：褚丽兰）",
-        //         children: [
-        //           {
-        //             title: "党员中心户",
-        //             type: 4,
-        //             name: "周游",
-        //           },
-        //           {
-        //             title: "党员中心户",
-        //             type: 4,
-        //             name: "王阳明",
-        //           },
-        //           {
-        //             title: "党员中心户",
-        //             type: 4,
-        //             name: "刘艳萍",
-        //           },
-        //           {
-        //             title: "党员中心户",
-        //             type: 4,
-        //             name: "谢苗苗",
-        //           },
-        //           {
-        //             title: "党员中心户",
-        //             type: 4,
-        //             name: "杨军",
-        //           },
-        //         ],
-        //       },
-        //     ],
-        //   },
-        //   {
-        //     title: "网格党支部",
-        //     name: "第二网格党支部 （支部书记：尤芬紫）",
-        //     type: 3,
-        //     children: [
-        //       {
-        //         title: "楼院党小组",
-        //         type: 3,
-        //         name: "第一楼院党小组 （组长：韩文国）",
-        //         children: [
-        //           {
-        //             title: "党员中心户",
-        //             type: 4,
-        //             name: "周游",
-        //           },
-        //           {
-        //             title: "党员中心户",
-        //             type: 4,
-        //             name: "王阳明",
-        //             children: [
-        //               {
-        //                 title: "联系家庭",
-        //                 type: 5,
-        //                 name: "王宇",
-        //               },
-        //               {
-        //                 title: "联系家庭",
-        //                 type: 5,
-        //                 name: "刘冰冰",
-        //               },
-        //               {
-        //                 title: "联系家庭",
-        //                 type: 5,
-        //                 name: "杨飞宇",
-        //               },
-        //               {
-        //                 title: "联系家庭",
-        //                 type: 5,
-        //                 name: "齐天",
-        //               },
-        //             ],
-        //           },
-        //           {
-        //             title: "党员中心户",
-        //             type: 4,
-        //             name: "刘艳萍",
-        //           },
-        //           {
-        //             title: "党员中心户",
-        //             type: 4,
-        //             name: "谢苗苗",
-        //           },
-        //         ],
-        //       },
-        //       {
-        //         title: "楼院党小组",
-        //         type: 3,
-        //         name: "第二楼院党小组 （组长：褚丽兰）",
-        //         children: [
-        //           {
-        //             title: "党员中心户",
-        //             type: 4,
-        //             name: "周游",
-        //           },
-        //           {
-        //             title: "党员中心户",
-        //             type: 4,
-        //             name: "王阳明",
-        //           },
-        //           {
-        //             title: "党员中心户",
-        //             type: 4,
-        //             name: "刘艳萍",
-        //           },
-        //           {
-        //             title: "党员中心户",
-        //             type: 4,
-        //             name: "谢苗苗",
-        //           },
-        //         ],
-        //       },
-        //     ],
-        //   },
-        //   {
-        //     title: "网格党支部",
-        //     name: "第三网格党支部 （支部书记：凤桥强）",
-        //     type: 3,
-        //     children: [
-        //       {
-        //         title: "楼院党小组",
-        //         type: 3,
-        //         name: "第一楼院党小组 （组长：韩文国）",
-        //         children: [
-        //           {
-        //             title: "党员中心户",
-        //             type: 4,
-        //             name: "周游",
-        //           },
-        //           {
-        //             title: "党员中心户",
-        //             type: 4,
-        //             name: "王阳明",
-        //           },
-        //           {
-        //             title: "党员中心户",
-        //             type: 4,
-        //             name: "刘艳萍",
-        //           },
-        //           {
-        //             title: "党员中心户",
-        //             type: 4,
-        //             name: "谢苗苗",
-        //           },
-        //           {
-        //             title: "党员中心户",
-        //             type: 4,
-        //             name: "杨军",
-        //           },
-        //         ],
-        //       },
-        //       {
-        //         title: "楼院党小组",
-        //         type: 3,
-        //         name: "第二楼院党小组 （组长：褚丽兰）",
-        //         children: [
-        //           {
-        //             title: "党员中心户",
-        //             type: 4,
-        //             name: "周游",
-        //           },
-        //           {
-        //             title: "党员中心户",
-        //             type: 4,
-        //             name: "王阳明",
-        //           },
-        //           {
-        //             title: "党员中心户",
-        //             type: 4,
-        //             name: "刘艳萍",
-        //           },
-        //           {
-        //             title: "党员中心户",
-        //             type: 4,
-        //             name: "谢苗苗",
-        //           },
-        //           {
-        //             title: "党员中心户",
-        //             type: 4,
-        //             name: "杨军",
-        //           },
-        //         ],
-        //       },
-        //       {
-        //         title: "楼院党小组",
-        //         type: 3,
-        //         name: "第三楼院党小组 （组长：王丽丽）",
-        //         children: [
-        //           {
-        //             title: "党员中心户",
-        //             type: 4,
-        //             name: "周游",
-        //           },
-        //           {
-        //             title: "党员中心户",
-        //             type: 4,
-        //             name: "王阳明",
-        //           },
-        //           {
-        //             title: "党员中心户",
-        //             type: 4,
-        //             name: "刘艳萍",
-        //           },
-        //           {
-        //             title: "党员中心户",
-        //             type: 4,
-        //             name: "谢苗苗",
-        //           },
-        //         ],
-        //       },
-        //     ],
-        //   },
-        // ],
-      },
+      nodeConfig: {},
     };
   },
   computed: {},
diff --git a/src/views/dataBoard/organizational/jwTree/index.vue b/src/views/dataBoard/organizational/jwTree/index.vue
index 763f97ba0..9d89ecbf6 100644
--- a/src/views/dataBoard/organizational/jwTree/index.vue
+++ b/src/views/dataBoard/organizational/jwTree/index.vue
@@ -1,3 +1,4 @@
+<!-- 调用树组件 -->
 <template>
   <div class="wrap">
     <!-- v-on:wheel="zoomSize" :style="'transform: scale(' + nowVal / 100 + ');'" -->
@@ -10,8 +11,8 @@
           <div class="contentList"></div>
         </el-col>
         <el-col :span="21">
-          <div class="dingflow-design" :style="{ height: treeHeight + 'px' }" v-loading="loading" element-loading-text="加载中" element-loading-spinner="el-icon-loading" element-loading-background="rgba(0, 21, 64, 0.3)">
-            <nodeWrapJw :nodeConfig.sync="nodeConfig"></nodeWrapJw>
+          <div class="dingflow-design overflow-hidden" :style="{ height: treeHeight + 'px' }" v-loading="loading" element-loading-text="加载中" element-loading-spinner="el-icon-loading" element-loading-background="rgba(0, 21, 64, 0.3)">
+            <nodeWrapJw :nodeConfig.sync="nodeConfig" ></nodeWrapJw>
           </div>
         </el-col>
       </el-row>
@@ -46,6 +47,12 @@ export default {
     // if (orgId) {
     //   this.getTreeData();
     // }
+    this.$EventBus.$on('handelClickJWNode', (val) => {
+       this.levelArr.push(val[0].level)
+      const myArray = [...new Set(this.levelArr)];
+      this.treeHeight = myArray.length * 180 + 220;
+      this.levelArr = this.getLevelArrNum(myArray);
+    })
     this.getTreeData();
   },
   methods: {
@@ -73,7 +80,6 @@ export default {
       }
       return arr;
     },
-
     //获取背景层级
     getDataPLevel(data) {
       data.forEach((item) => {
@@ -82,7 +88,7 @@ export default {
           this.getDataPLevel(item.children);
         }
       });
-      const myArray = [...new Set(this.levelArr)];
+      const myArray = [...new Set(this.levelArr)].filter(item=>item!='village');
       this.treeHeight = myArray.length * 180 + 220;
       this.levelArr = this.getLevelArrNum(myArray);
     },
@@ -280,7 +286,7 @@ export default {
     .flowLevel-5 {
       top: 775px;
       height: 180px !important;
-      line-height: 130px;
+      line-height: 180px;
 
       div {
         padding-left: 80px;
@@ -401,4 +407,7 @@ export default {
     }
   }
 }
+.overflow-hidden{
+  overflow-y: hidden;
+}
 </style>
diff --git a/src/views/dataBoard/organizational/microgrid/components/reportAnOldEvent.vue b/src/views/dataBoard/organizational/microgrid/components/reportAnOldEvent.vue
new file mode 100644
index 000000000..4f6872b3b
--- /dev/null
+++ b/src/views/dataBoard/organizational/microgrid/components/reportAnOldEvent.vue
@@ -0,0 +1,272 @@
+<template>
+  <Dialog title="事件详情" @close="handleClose">
+    <template>
+      <div class="eventWrap">
+        <el-row :gutter="32">
+          <el-col :span="13" style="padding-left: 40px" v-loading="loading" element-loading-text="加载中" element-loading-spinner="el-icon-loading" element-loading-background="rgba(0, 21, 64, 0.3)">
+            <div class="leftEvent">
+              <div class="eventDetails">事件详情</div>
+              <div class="eventItem">
+                <span>所属组织：</span>
+                <span>{{ item.gridName }}</span>
+              </div>
+              <div class="eventItem">
+                <span>上报渠道：</span>
+                <span>{{ item.sourceTypeName }}</span>
+              </div>
+              <div class="eventItem">
+                <span>接受时间：</span>
+                <span>{{ item.happenTime }}</span>
+              </div>
+              <div class="eventItem">
+                <span>工单号：</span>
+                <span>{{ item.workOrderNum }}</span>
+              </div>
+              <div class="eventItem">
+                <div>问题描述：</div>
+                <div style="margin-top: 20px">{{ item.eventContent }}</div>
+              </div>
+              <div class="eventItem">
+                <div>图片：</div>
+                <div style="margin-top: 20px; display: flex">
+                  <img style="width: 100px; height: 100px; margin-right: 5px" v-for="src in item.imageList" :key="src" :src="src" alt="/" @click="openImg(src)" />
+                </div>
+              </div>
+              <div class="eventItem">
+                <span>联系人：</span>
+                <span>{{ item.name }}</span>
+              </div>
+              <div class="eventItem">
+                <span>联系电话：</span>
+                <span>{{ $sensitive(item.mobile, 3, 7) }}</span>
+              </div>
+              <div class="eventItem">
+                <span>详细地址：</span>
+                <span>{{ item.address }}</span>
+              </div>
+              <div class="eventItem">
+                <span>办结时限：</span>
+                <span>{{ item.gridName }}</span>
+              </div>
+              <div class="eventItem">
+                <span>满意度评价：</span>
+                <span>{{ item.satisfactionName }}</span>
+              </div>
+            </div>
+          </el-col>
+          <el-col :span="11" v-loading="loading1" element-loading-text="加载中" element-loading-spinner="el-icon-loading" element-loading-background="rgba(0, 21, 64, 0.3)">
+            <div class="rightEvent m-info">
+              <div class="eventDetails">办理进展</div>
+              <!-- <el-timeline class="timeline" :reverse="true">
+                <el-timeline-item v-for="(item, index) in activities" :key="index" :class="index == activities.length - 1 ? 'sucess' : ''">
+                  <div class="status-box">
+                    <div class="status1" v-if="index == activities.length - 1">回复</div>
+                    <div class="status2" v-else>完成并回复</div>
+                    <div class="timestamp">{{ item.timeLimit ? $moment(item.timeLimit).format("YYYY-MM-DD hh:mm:ss") : "" }}</div>
+                  </div>
+                  <div class="content">
+                    <div class="field">回复人：</div>
+                    <div class="value">{{ item.departmentName }}</div>
+                  </div>
+                  <div class="content">
+                    <div class="field">回复内容：</div>
+                    <div class="value">{{ item.publicReply }}</div>
+                  </div>
+                </el-timeline-item>
+              </el-timeline> -->
+              <div v-if="activities.length > 0">
+                <!-- <el-card :class="{ 'box-card': source === 'visiual' }" style="min-height: calc(88vh - 50px); overflow: auto"> -->
+                <div class="m-process">
+                  <div class="list">
+                    <div class="item" :class="[index === 0 ? 'z-on' : '']" :key="item.processId" v-for="(item, index) in activities">
+                      <div class="item-row">
+                        <template v-if="item.agencyId">
+                          <div class="name">指派</div>
+                        </template>
+                        <template v-if="!item.timeLimit">
+                          <div class="name">完成并回复</div>
+                        </template>
+                        <template v-if="!item.agencyId && item.timeLimit">
+                          <div class="name">{{ item.processName }}</div>
+                        </template>
+                        <div class="date">
+                          {{ item.processTime ? getTrueTime(item.processTime) : "" }}
+                        </div>
+                      </div>
+                      <div v-if="item.type === 'event'">
+                        <template v-if="item.agencyId">
+                          <div class="detail">
+                            <div class="detail-field">指派人：</div>
+                            <div class="detail-value">{{ item.departmentName }}</div>
+                          </div>
+                          <div class="detail">
+                            <div class="detail-field">指派部门：</div>
+                            <div class="detail-value">{{ item.agencyName }}</div>
+                          </div>
+                          <div class="detail">
+                            <div class="detail-field">转办意见：</div>
+                            <div class="detail-value">{{ item.publicReply }}</div>
+                          </div>
+                          <div class="detail">
+                            <div class="detail-field">办结时限：</div>
+                            <div class="detail-value">{{ formTimeLimit(item.timeLimit) }}</div>
+                          </div>
+                        </template>
+                        <template v-else>
+                          <div class="detail">
+                            <div class="detail-field">回复人：</div>
+                            <div class="detail-value">{{ item.departmentName }}</div>
+                          </div>
+                          <div class="detail">
+                            <div class="detail-field">回复内容：</div>
+                            <div class="detail-value">{{ item.publicReply }}</div>
+                          </div>
+                          <div class="detail" v-if="item.timeLimit">
+                            <div class="detail-field">办结时限：</div>
+                            <div class="detail-value">{{ getTrueTime(item.timeLimit) }}</div>
+                          </div>
+                        </template>
+                      </div>
+                    </div>
+                  </div>
+                </div>
+                <!-- </el-card> -->
+              </div>
+            </div>
+          </el-col>
+        </el-row>
+      </div>
+    </template>
+  </Dialog>
+</template>
+
+<script>
+import Dialog from "@/components/Dialog/index.vue";
+
+export default {
+  name: "ReportAnEvent",
+  components: { Dialog },
+  props: {
+    id: {
+      type: String,
+      default: "",
+    },
+  },
+
+  data() {
+    return {
+      item: {},
+      loading: false,
+      loading1: false,
+      activities: [],
+    };
+  },
+
+  computed: {},
+  watch: {
+    id: {
+      handler(val) {
+        if (val) {
+          this.getDetailsData(val);
+          this.getProcessData(val);
+        }
+      },
+      immediate: true,
+    },
+  },
+  mounted() {},
+
+  methods: {
+    handleClose() {
+      this.$emit("close", false);
+      this.item = {};
+    },
+
+    openImg(src) {
+      window.open(src);
+    },
+
+    getTrueTime(time) {
+      return this.$moment(time * 1000).format("YYYY-MM-DD hh:mm");
+    },
+
+    getDetailsData(id) {
+      this.loading = true;
+      this.$http.post("/governance/icEventOld/detail", { icEventId: id }).then((res) => {
+        const { code, data, msg } = res.data;
+        if (code === 0) {
+          this.item = data;
+          this.loading = false;
+        } else {
+          this.loading = false;
+          this.$message.error(msg);
+        }
+      });
+    },
+
+    getProcessData(id) {
+      this.$http.post("/governance/icEventOld/process", { icEventId: id }).then((res) => {
+        const { code, data, msg } = res.data;
+        if (code === 0) {
+          this.activities = data;
+          this.loading1 = false;
+        } else {
+          this.loading1 = false;
+          this.$message.error(msg);
+        }
+      });
+    },
+  },
+};
+</script>
+
+<style lang="scss" src="@/assets/scss/dataBoard/popup-info.scss" scoped></style>
+
+<style lang="scss" scoped>
+@import "@/assets/scss/modules/shequzhili/event-info.scss";
+@mixin fontStyle {
+  color: #fff !important;
+  font-size: 14px !important;
+}
+.eventWrap {
+  height: 500px;
+  overflow-y: auto;
+  overflow-x: hidden;
+  .eventDetails {
+    font-size: 16px;
+    margin: 24px 0;
+  }
+  .m-info {
+    padding: 0px !important;
+    .m-process {
+      margin: 0 !important;
+      .name {
+        @include fontStyle;
+      }
+      .date {
+        @include fontStyle;
+      }
+      .detail {
+        @include fontStyle;
+        .detail-field {
+          flex: none !important;
+        }
+      }
+    }
+  }
+  .leftEvent {
+    color: #fff;
+    .eventItem {
+      font-size: 14px;
+      margin-bottom: 24px;
+      span:first-child {
+      }
+      span:last-child {
+      }
+    }
+  }
+  .rightEvent {
+    color: #fff;
+  }
+}
+</style>
diff --git a/src/views/dataBoard/organizational/microgrid/index.vue b/src/views/dataBoard/organizational/microgrid/index.vue
index 8adc462a4..ceaf61f49 100644
--- a/src/views/dataBoard/organizational/microgrid/index.vue
+++ b/src/views/dataBoard/organizational/microgrid/index.vue
@@ -79,7 +79,7 @@
 import Breadcrumb from "@/views/dataBoard/satisfactionEval/components/Breadcrumb";
 import Pagination from "@/views/dataBoard/satisfactionEval/components/Pagination";
 import SameDialog from "./components/popDetails.vue";
-import ReportAnEvent from "./components/reportAnEvent.vue";
+import ReportAnEvent from "./components/reportAnOldEvent.vue";
 import Safetyhazard from "./components/safetyhazard.vue";
 import { get } from "sortablejs";
 export default {
diff --git a/src/views/dataBoard/overview/components/Bmysxxq.vue b/src/views/dataBoard/overview/components/Bmysxxq.vue
index 0147acf9d..d3a2348c2 100644
--- a/src/views/dataBoard/overview/components/Bmysxxq.vue
+++ b/src/views/dataBoard/overview/components/Bmysxxq.vue
@@ -87,7 +87,7 @@
               <div class="items">
                 <div class="label">服务方：</div>
                 <el-select
-                    v-model="form.serverOrgType"
+                    v-model.trim="form.serverOrgType"
                     class="select"
                     clearable
                     popper-class="selectPopClass"
@@ -100,7 +100,7 @@
                       :value="item.value"
                   />
                 </el-select>
-                <el-select v-model="form.serverOrgId" class="select" popper-class="selectPopClass">
+                <el-select v-model.trim="form.serverOrgId" class="select" popper-class="selectPopClass">
                   <el-option
                       v-for="item in serviceOptiondList"
                       :key="item.id"
@@ -116,7 +116,7 @@
               <div class="items">
                 <div class="label">自动通知服务方：</div>
                 <el-checkbox-group
-                    v-model="form.noticeApproches"
+                    v-model.trim="form.noticeApproches"
                     class="select"
                     popper-class="selectPopClass"
                     text-color="#fff"
@@ -132,7 +132,7 @@
                 <el-cascader
                     :key="iscascaderShow"
                     ref="myCascader"
-                    v-model="form.serviceScopeList"
+                    v-model.trim="form.serviceScopeList"
                     :options="casOptions"
                     :props="optionProps"
                     :show-all-levels="false"
@@ -146,7 +146,7 @@
               <div class="items">
                 <div class="label">服务时间：</div>
                 <el-date-picker
-                    v-model="form.date"
+                    v-model.trim="form.date"
                     :append-to-body="false"
                     class="select"
                     end-placeholder="结束日期"
@@ -177,6 +177,7 @@
     <ResourceScheduling
         ref="ResourceScheduling"
         :currentLevelData="currentLevelData"
+        :demandRecDetail="detail"
         @handle="dispatchOrder"
     />
 
diff --git a/src/views/dataBoard/overview/components/DemandCharts.vue b/src/views/dataBoard/overview/components/DemandCharts.vue
index c9d438b2a..1bb458be5 100644
--- a/src/views/dataBoard/overview/components/DemandCharts.vue
+++ b/src/views/dataBoard/overview/components/DemandCharts.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="charts">
-    <el-select v-model="date" class="select" placeholder="请选择" popper-class="selectPopClass" @change="timeChange">
+    <el-select v-model.trim="date" class="select" placeholder="请选择" popper-class="selectPopClass" @change="timeChange">
       <el-option v-for="item in dateList" :key="item.value" :label="item.label" :value="item.value"/>
     </el-select>
     <div id="DemandCharts"></div>
diff --git a/src/views/dataBoard/overview/components/DemandCharts2.vue b/src/views/dataBoard/overview/components/DemandCharts2.vue
index 9175403f2..49c1d3e15 100644
--- a/src/views/dataBoard/overview/components/DemandCharts2.vue
+++ b/src/views/dataBoard/overview/components/DemandCharts2.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="charts">
-    <el-select v-model="date" class="select" placeholder="请选择" popper-class="selectPopClass" @change="timeChange">
+    <el-select v-model.trim="date" class="select" placeholder="请选择" popper-class="selectPopClass" @change="timeChange">
       <el-option v-for="item in dateList" :key="item.value" :label="item.label" :value="item.value"/>
     </el-select>
     <div id="DemandCharts2"></div>
diff --git a/src/views/dataBoard/overview/components/EventAndFollowUp.vue b/src/views/dataBoard/overview/components/EventAndFollowUp.vue
index 890b93bfc..1f28d5c70 100644
--- a/src/views/dataBoard/overview/components/EventAndFollowUp.vue
+++ b/src/views/dataBoard/overview/components/EventAndFollowUp.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="event">
     <!--    <div class="tabs">
-      <Tabs v-model="type" :list="typeList" @changeVal="typeChange"/>
+      <Tabs v-model.trim="type" :list="typeList" @changeVal="typeChange"/>
     </div>-->
     <div class="content">
       <div class="total">
diff --git a/src/views/dataBoard/overview/components/EventDetail.vue b/src/views/dataBoard/overview/components/EventDetail.vue
index 7a5b64754..aacb35492 100644
--- a/src/views/dataBoard/overview/components/EventDetail.vue
+++ b/src/views/dataBoard/overview/components/EventDetail.vue
@@ -198,8 +198,7 @@
           </el-col>
         </el-row>
 
-        <div class="btn-group" v-if="(item.status === 'processing' && item.operationId) || (item.status === 'closed_case' &&
-                (item.satisfactionName || (!item.satisfactionName && user.id != item.createdUserId)))">
+        <div class="btn-group" v-if="(item.status === 'processing')">
           <el-button class="green" plain round type="success" @click="handleDispatch">资源调度</el-button>
           <el-button class="orange" plain round type="warning" @click="handleSupervision">催办督办</el-button>
         </div>
diff --git a/src/views/dataBoard/overview/components/EventDispatchOrder/Assign.vue b/src/views/dataBoard/overview/components/EventDispatchOrder/Assign.vue
index 82428900d..7fd210a7a 100644
--- a/src/views/dataBoard/overview/components/EventDispatchOrder/Assign.vue
+++ b/src/views/dataBoard/overview/components/EventDispatchOrder/Assign.vue
@@ -6,7 +6,7 @@
         <el-cascader
             :key="iscascaderShow"
             ref="myCascader"
-            v-model="selCategoryArray"
+            v-model.trim="selCategoryArray"
             :options="casOptions"
             :props="optionProps"
             :show-all-levels="false"
@@ -22,7 +22,7 @@
         <div class="label required">处理部门：</div>
         <el-cascader
             ref="agencyIdArray"
-            v-model="agencyIdArray"
+            v-model.trim="agencyIdArray"
             :options="orgOptions"
             :props="orgOptionProps"
             :show-all-levels="false"
@@ -42,7 +42,7 @@
     <el-col :span="24">
       <div class="items">
         <el-input
-            v-model="form.content"
+            v-model.trim="form.content"
             :autosize="{ minRows: 5, maxRows: 10}"
             class="input"
             maxlength="500"
@@ -78,7 +78,7 @@
       <div class="items">
         <div class="label required">办结时限：</div>
         <el-date-picker
-            v-model="form.timeLimit"
+            v-model.trim="form.timeLimit"
             :append-to-body="false"
             format="yyyy-MM-dd"
             placeholder="请选择办结时限"
diff --git a/src/views/dataBoard/overview/components/EventDispatchOrder/TransferService.vue b/src/views/dataBoard/overview/components/EventDispatchOrder/TransferService.vue
index 2b6a60751..b9a1b9a1f 100644
--- a/src/views/dataBoard/overview/components/EventDispatchOrder/TransferService.vue
+++ b/src/views/dataBoard/overview/components/EventDispatchOrder/TransferService.vue
@@ -6,7 +6,7 @@
           <div class="label required">服务内容：</div>
           <div class="value">
             <el-input
-                v-model="formData.content"
+                v-model.trim="formData.content"
                 :autosize="{ minRows: 2, maxRows: 10 }"
                 class="cell-width-area"
                 clearable
@@ -22,7 +22,7 @@
             <div class="label required">服务类型：</div>
             <div class="value">
               <el-cascader
-                  v-model="formData.categoryCode"
+                  v-model.trim="formData.categoryCode"
                   :options="demandOptions"
                   class="cell-width-1"
                   clearable
@@ -39,7 +39,7 @@
             <div class="label required">服务时间：</div>
             <div class="value">
               <el-date-picker
-                  v-model="formData.wantServiceTime"
+                  v-model.trim="formData.wantServiceTime"
                   class="cell-width-1"
                   clearable placeholder="选择日期时间"
                   type="datetime"
@@ -54,7 +54,7 @@
           <div class="items">
             <div class="label required">需求人：</div>
             <div class="value">
-              <el-input v-model="formData.demandUserName" class="cell-width-1"/>
+              <el-input v-model.trim="formData.demandUserName" class="cell-width-1"/>
             </div>
           </div>
         </el-form-item>
@@ -64,7 +64,7 @@
           <div class="items">
             <div class="label required">联系电话：</div>
             <div class="value">
-              <el-input v-model="formData.demandUserMobile" class="cell-width-1"/>
+              <el-input v-model.trim="formData.demandUserMobile" class="cell-width-1"/>
             </div>
           </div>
         </el-form-item>
@@ -74,7 +74,7 @@
           <div class="items">
             <div class="label required">服务地点：</div>
             <div class="value">
-              <el-input v-model="formData.serviceLocation" class="cell-width-1"/>
+              <el-input v-model.trim="formData.serviceLocation" class="cell-width-1"/>
             </div>
           </div>
         </el-form-item>
@@ -86,7 +86,7 @@
             <div class="value">
               <!--              <div class="div_searchmap">
                               <el-input
-                                  v-model="keyWords"
+                                  v-model.trim="keyWords"
                                   class="cell-width-map"
                                   maxlength="50"
                                   placeholder="请输入关键字"
@@ -107,7 +107,7 @@
           <div class="items">
             <div class="label">门牌号：</div>
             <div class="value">
-              <el-input v-model="formData.locationDetail" class="cell-width-1"/>
+              <el-input v-model.trim="formData.locationDetail" class="cell-width-1"/>
             </div>
           </div>
         </el-form-item>
@@ -118,7 +118,7 @@
             <div class="label required">服务组织：</div>
             <div class="value serviceOrg">
               <el-select
-                  v-model="formData.serviceType"
+                  v-model.trim="formData.serviceType"
                   class="cell-width-1"
                   clearable placeholder="请选择"
                   @change="handleServiceChange('add', $event)"
@@ -132,7 +132,7 @@
               </el-select>
               <div class="line">-</div>
               <el-select
-                  v-model="formData.serverId"
+                  v-model.trim="formData.serverId"
                   class="cell-width-1"
                   clearable
                   filterable
diff --git a/src/views/dataBoard/overview/components/EventDispatchOrder/index.vue b/src/views/dataBoard/overview/components/EventDispatchOrder/index.vue
index a531ba8d7..9708d0ee3 100644
--- a/src/views/dataBoard/overview/components/EventDispatchOrder/index.vue
+++ b/src/views/dataBoard/overview/components/EventDispatchOrder/index.vue
@@ -46,7 +46,7 @@
               <div class="items" style="align-items: center">
                 <div class="label required">处理方式：</div>
                 <el-radio-group
-                    v-model="form.operationType"
+                    v-model.trim="form.operationType"
                     class="select"
                     popper-class="selectPopClass"
                     text-color="#fff">
diff --git a/src/views/dataBoard/overview/components/MapDialog/DemandList.vue b/src/views/dataBoard/overview/components/MapDialog/DemandList.vue
index 4503ab4a5..fe7ef5098 100644
--- a/src/views/dataBoard/overview/components/MapDialog/DemandList.vue
+++ b/src/views/dataBoard/overview/components/MapDialog/DemandList.vue
@@ -1,6 +1,6 @@
 <template>
   <div>
-    <Tabs v-model="type" :list="typeList" @changeVal="typeChange"/>
+    <Tabs v-model.trim="type" :list="typeList" @changeVal="typeChange"/>
 
     <div v-if="type === '1'" class="table">
       <el-table v-loading="loading" :data="list" element-loading-background="rgba(0, 0, 0, 0.3)"
@@ -130,6 +130,8 @@ export default {
         categoryCode: this.categoryCode,
         level: 1,
         undoneStauts: 'undone',
+        orgId: this.currentLevelData.orgId,
+        orgLevel: this.currentLevelData.orgLevel,
         pageNo: this.queryParams.pageNo
       }).then(res => {
         this.loading = false
diff --git a/src/views/dataBoard/overview/components/MapDialog/DisputeDispatch.vue b/src/views/dataBoard/overview/components/MapDialog/DisputeDispatch.vue
index 8cb41a100..304f68bae 100644
--- a/src/views/dataBoard/overview/components/MapDialog/DisputeDispatch.vue
+++ b/src/views/dataBoard/overview/components/MapDialog/DisputeDispatch.vue
@@ -1,6 +1,6 @@
 <template>
   <div>
-    <Tabs v-model="type" :list="typeList" @changeVal="typeChange"/>
+    <Tabs v-model.trim="type" :list="typeList" @changeVal="typeChange"/>
     <div v-if="type === '4'" class="table">
       <el-table v-loading="loading" :data="list" element-loading-background="rgba(0, 0, 0, 0.3)"
                 height="280px">
diff --git a/src/views/dataBoard/overview/components/MapDialog/ResourceDispatch.vue b/src/views/dataBoard/overview/components/MapDialog/ResourceDispatch.vue
index d264a0f3e..861963947 100644
--- a/src/views/dataBoard/overview/components/MapDialog/ResourceDispatch.vue
+++ b/src/views/dataBoard/overview/components/MapDialog/ResourceDispatch.vue
@@ -1,6 +1,6 @@
 <template>
   <div>
-    <Tabs v-model="type" :list="typeList" @changeVal="typeChange"/>
+    <Tabs v-model.trim="type" :list="typeList" @changeVal="typeChange"/>
     <div class="table" v-if="type === '4'">
       <el-table v-loading="loading" :data="list" element-loading-background="rgba(0, 0, 0, 0.3)"
                 height="250px">
diff --git a/src/views/dataBoard/overview/components/MapResourceInfoMore.vue b/src/views/dataBoard/overview/components/MapResourceInfoMore.vue
index 1c6c1d7d0..1aed9e280 100644
--- a/src/views/dataBoard/overview/components/MapResourceInfoMore.vue
+++ b/src/views/dataBoard/overview/components/MapResourceInfoMore.vue
@@ -22,7 +22,7 @@
                 <div class="value">{{ typesList[types] }}</div>
               </div>
             </el-col>
-            <template v-if="types === 2 || types === 3">
+            <template v-if="types === 2">
               <el-col :span="12">
 
                 <div class="items">
@@ -189,7 +189,7 @@
               </el-col>
             </template>
           </el-row>
-          <Tabs v-model="type" :list="typeList" @changeVal="typeChange"/>
+          <Tabs v-model.trim="type" :list="typeList" @changeVal="typeChange"/>
           <div class="table">
             <el-table v-loading="loading" :data="list" element-loading-background="rgba(0, 0, 0, 0.3)"
                       height="250px">
diff --git a/src/views/dataBoard/overview/components/ResourceInfo.vue b/src/views/dataBoard/overview/components/ResourceInfo.vue
index ef01c280a..9949e8dab 100644
--- a/src/views/dataBoard/overview/components/ResourceInfo.vue
+++ b/src/views/dataBoard/overview/components/ResourceInfo.vue
@@ -109,37 +109,37 @@
 
             <div class="items">
               <div class="label">姓名：</div>
-              <div class="value">{{ detail.name }}</div>
+              <div class="value">{{ rowData.name }}</div>
             </div>
 
             <div class="items">
               <div class="label">联系电话：</div>
-              <div class="value">{{ detail.mobile }}</div>
+              <div class="value">{{ rowData.mobile }}</div>
               <CallPhone icon="el-icon-phone"/>
             </div>
 
             <div class="items">
               <div class="label">年龄：</div>
-              <div class="value">{{ detail.birthday?getAgeByDateOfBirth(detail.birthday):'未知' }}</div>
+              <div class="value">{{ rowData.longitude||'--' }}</div>
             </div>
-            <div class="items">
+            <!-- <div class="items">
               <div class="label">学历：</div>
               <div class="value">{{ education?education.cultureLevelName:'' }}</div>
-            </div>
+            </div> -->
 
             <!--            <div class="items">
                           <div class="label">状态：</div>
                           <div class="value">巡查中</div>
                         </div>-->
 
-            <div class="items">
+            <!-- <div class="items">
               <div class="label">所在位置：</div>
               <div class="value">{{ detail.houseInfo?detail.houseInfo.homeName: '' }}</div>
             </div>
             <div class="items">
               <div class="label">兴趣爱好：</div>
               <div class="value">{{ hobby?hobby.hobbyRemark:'' }}</div>
-            </div>
+            </div> -->
           </template>
           <div class="btn-group">
             <el-button class="sure" plain round type="warning" @click="handleSure">派单</el-button>
diff --git a/src/views/dataBoard/overview/components/ResourceScheduling.vue b/src/views/dataBoard/overview/components/ResourceScheduling.vue
index d5e07918a..070b97bfb 100644
--- a/src/views/dataBoard/overview/components/ResourceScheduling.vue
+++ b/src/views/dataBoard/overview/components/ResourceScheduling.vue
@@ -41,11 +41,11 @@
                       }}
                     </template>
                   </el-table-column>
-                  <el-table-column v-if="peopleType !== '4' && peopleType !== '5'" label="所属组织" min-width="180"
+                  <el-table-column v-if="peopleType !== '4' && peopleType !== '5'&& peopleType !== 'volunteer'&& peopleType !== 'publicWelfareNum'" label="所属组织" min-width="180"
                                    prop="orgName"/>
-                  <el-table-column v-if="peopleType !== '4' && peopleType !== '5'" label="姓名/名称" min-width="120"
+                  <el-table-column v-if="peopleType !== '4' && peopleType !== '5'&& peopleType !== 'volunteer'&& peopleType !== 'publicWelfareNum'" label="姓名/名称" min-width="120"
                                    prop="name"/>
-                  <el-table-column v-if="peopleType !== '4' && peopleType !== '5'" label="联系电话" min-width="120"
+                  <el-table-column v-if="peopleType !== '4' && peopleType !== '5'&& peopleType !== 'volunteer'&& peopleType !== 'publicWelfareNum'" label="联系电话" min-width="120"
                                    prop="mobile">
                     <template slot-scope="scope">
                       {{ $sensitive(scope.row.mobile, 3, 7) }}
@@ -62,11 +62,15 @@
                     </template>
                   </el-table-column>
 
-                  <el-table-column v-if="peopleType === '5'" label="所属组织" min-width="180" prop="agencyName"/>
-                  <el-table-column v-if="peopleType === '5'" label="联系人" min-width="120" prop="contact"/>
-                  <el-table-column v-if="peopleType === '5'" label="联系电话" min-width="120" prop="contactMobile">
+                  <el-table-column v-if="peopleType === 'publicWelfareNum' || peopleType=== 'volunteer'" label="所属组织" min-width="180" prop="agencyName">
+                    <template scope-row="row">
+                        {{this.$store.state.user.agencyName}}
+                    </template>
+                  </el-table-column>
+                  <el-table-column v-if="peopleType === 'publicWelfareNum' || peopleType=== 'volunteer'" label="联系人" min-width="120" prop="name"/>
+                  <el-table-column v-if="peopleType === 'publicWelfareNum' || peopleType=== 'volunteer'" label="联系电话" min-width="120" prop="mobile">
                     <template slot-scope="scope">
-                      {{ $sensitive(scope.row.contactMobile, 3, 7) }}
+                      {{ $sensitive(scope.row.mobile, 3, 7) }}
                     </template>
                   </el-table-column>
 
@@ -110,7 +114,12 @@ export default {
       type: Object,
       default: () => {
       },
-    }
+    },
+    demandRecDetail: {
+      type: Object,
+      default: () => {
+      },
+    },
   },
   data() {
     return {
@@ -240,13 +249,28 @@ export default {
         console.log(data);
         if (this.peopleType === '4') {
           this.getZzzList();
-        } else if (this.peopleType === '5') {
+        } else if (this.peopleType === '5' ) {
           this.getLjdwList();
+        }  else if (this.peopleType === 'publicWelfareNum' || this.peopleType === 'volunteer') {
+          this.getServerOrgNewTask();
         } else {
           this.getList()
         }
       }
     },
+    getServerOrgNewTask() {
+      let {parentCategoryCode,categoryCode} = this.demandRecDetail;
+      this.loading = true;
+      this.$http.post('/actual/base/serviceitem/listServerOrgNewTask', {
+        serverOrgType: this.peopleType == 'publicWelfareNum'?'publicWelfare':'ic_user_volunteer',
+        serverParentOrgCategoryCode:parentCategoryCode,
+        serverOrgCategoryCode:categoryCode
+      }).then(res => {
+        this.loading = false;
+        this.list = res.data.data;
+      })
+    },
+    
     handleHandle(data) {
       this.handleClose()
       this.$emit('handle', data);
diff --git a/src/views/dataBoard/overview/components/ServiceDetails.vue b/src/views/dataBoard/overview/components/ServiceDetails.vue
index 92f6b18af..3e0190825 100644
--- a/src/views/dataBoard/overview/components/ServiceDetails.vue
+++ b/src/views/dataBoard/overview/components/ServiceDetails.vue
@@ -126,7 +126,7 @@
               <div class="items">
                 <div class="label">服务方：</div>
                 <el-select
-                    v-model="form.serviceType"
+                    v-model.trim="form.serviceType"
                     class="select"
                     popper-class="selectPopClass"
                     @change="getServiceuserList($event, 'add_demand')"
@@ -140,7 +140,7 @@
                   </el-option>
                 </el-select>
                 <el-select
-                    v-model="form.serverId"
+                    v-model.trim="form.serverId"
                     class="select"
                     filterable
                     popper-class="selectPopClass"
@@ -172,7 +172,7 @@
         </div>
       </div>
     </el-dialog>
-    <ResourceScheduling ref="ResourceScheduling" :currentLevelData="currentLevelData" @handle="dispatchOrder"/>
+    <ResourceScheduling ref="ResourceScheduling"  :demandRecDetail="detail" :currentLevelData="currentLevelData" @handle="dispatchOrder"/>
     <Supervision ref="supervision" :currentLevelData="currentLevelData"/>
   </div>
 </template>
diff --git a/src/views/dataBoard/overview/components/Supervision.vue b/src/views/dataBoard/overview/components/Supervision.vue
index aa52e49a6..ac4e1b7d3 100644
--- a/src/views/dataBoard/overview/components/Supervision.vue
+++ b/src/views/dataBoard/overview/components/Supervision.vue
@@ -45,7 +45,7 @@
         </div>
         <div class="items">
           <el-input
-              v-model="content"
+              v-model.trim="content"
               :autosize="{ minRows: 5, maxRows: 10}"
               class="input"
               maxlength="500"
diff --git a/src/views/dataBoard/overview/components/jdjs.vue b/src/views/dataBoard/overview/components/jdjs.vue
index 6dfc589f4..23301af0d 100644
--- a/src/views/dataBoard/overview/components/jdjs.vue
+++ b/src/views/dataBoard/overview/components/jdjs.vue
@@ -21,7 +21,7 @@
     </div>
     <title-small text="不满意风险人员">
     <template v-slot:time>
-      <el-select v-model="typeCondition" popper-class="selectPopClass" placeholder="请选择" class="select" @change="timeChange">
+      <el-select v-model.trim="typeCondition" popper-class="selectPopClass" placeholder="请选择" class="select" @change="timeChange">
         <el-option v-for="item in typeConditionList" :key="item.value" :label="item.label" :value="item.value"> </el-option>
       </el-select>
     </template>
diff --git a/src/views/dataBoard/overview/components/map-top.vue b/src/views/dataBoard/overview/components/map-top.vue
index 67aea9ba8..e594c836d 100644
--- a/src/views/dataBoard/overview/components/map-top.vue
+++ b/src/views/dataBoard/overview/components/map-top.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="m-per m-l77">
     <el-autocomplete
-        v-model="keyWord"
+        v-model.trim="keyWord"
         :fetch-suggestions="querySearch"
         :placeholder="searchPlaceholder"
         :value-key="'value'"
@@ -9,7 +9,7 @@
         popper-class="selectPopClass"
         @select="handleSelect"
     >
-      <el-select slot="prepend" v-model="searchSelect" @change="keyWord = ''" placeholder="请选择" popper-class="selectPopClass">
+      <el-select slot="prepend" v-model.trim="searchSelect" @change="keyWord = ''" placeholder="请选择" popper-class="selectPopClass">
         <el-option label="需求" value="1"></el-option>
         <el-option label="问题" value="2"></el-option>
         <el-option label="资源" value="3"></el-option>
diff --git a/src/views/dataBoard/overview/potentialPeople/index.vue b/src/views/dataBoard/overview/potentialPeople/index.vue
index de30340e7..e01042fdb 100644
--- a/src/views/dataBoard/overview/potentialPeople/index.vue
+++ b/src/views/dataBoard/overview/potentialPeople/index.vue
@@ -5,7 +5,7 @@
       <el-form :model="queryParams" inline>
         <el-select
           popper-class="selectPopClass"
-          v-model="queryParams.agencyId"
+          v-model.trim="queryParams.agencyId"
           clearable
           size="small"
           placeholder="按组织"
@@ -19,7 +19,7 @@
         </el-select>
         <el-select
           popper-class="selectPopClass"
-          v-model="queryParams.satisfactionSource"
+          v-model.trim="queryParams.satisfactionSource"
           clearable
           size="small"
           placeholder="按类型"
diff --git a/src/views/dataBoard/renfang/cpts/rkfx.vue b/src/views/dataBoard/renfang/cpts/rkfx.vue
index 533f2b0ef..3187c105b 100644
--- a/src/views/dataBoard/renfang/cpts/rkfx.vue
+++ b/src/views/dataBoard/renfang/cpts/rkfx.vue
@@ -397,7 +397,7 @@ export default {
     display: flex;
     align-items: center;
     justify-content: space-between;
-    margin-left: 25px;
+    margin-left: 15px;
 
     .legend {
       // flex: 0 0 140px;
diff --git a/src/views/dataBoard/renfang/index.vue b/src/views/dataBoard/renfang/index.vue
index 38d381d4f..54014aa16 100644
--- a/src/views/dataBoard/renfang/index.vue
+++ b/src/views/dataBoard/renfang/index.vue
@@ -128,7 +128,7 @@
               </div>
 
               <input
-                  v-model="searchModule.keyword"
+                  v-model.trim="searchModule.keyword"
                   placeholder="搜索本组织及下级的居民、小区、楼栋、房屋"
                   type="text"
                   @keyup.enter="handleSearch"
@@ -305,7 +305,7 @@
                 <div class="item-per">
                   <span>较上一年</span>
                   <img
-                      v-if="item.isTop"
+                      v-if="item.growth > 0"
                       src="~@/assets/images/shuju/renfang/index/up.png"
                   />
                   <img
@@ -546,11 +546,12 @@ export default {
     },
 
     handleClickDotBtn(type, info) {
+      console.log(info,'--------------');
       if (type == "watch-resi") {
         this.$router.push({
           path: "/dataBoard/renfang/resident",
           query: {
-            user_id: info.user_id,
+            user_id:info.search_id,
           },
         });
         // this.displayedResiId = info.user_id;
@@ -639,7 +640,7 @@ export default {
             }
           }
           if (type == "1") {
-            title = item.user_name;
+            title = item.name;
           } else if (type == "2") {
             title = detailJson.village;
           } else if (type == "3") {
@@ -757,7 +758,7 @@ export default {
                 (100 * item.categoryCount) / data.resiCount
             ),
             // per: item.change_ratio,
-            growth: item.change_ratio,
+            growth: item.categoryCountNext - item.categoryCount,
             growthAbs: Math.abs(item.categoryCountNext - item.categoryCount)
           };
         });
diff --git a/src/views/dataBoard/renfang/resi/class.vue b/src/views/dataBoard/renfang/resi/class.vue
index 7a72559ef..74bfa060e 100644
--- a/src/views/dataBoard/renfang/resi/class.vue
+++ b/src/views/dataBoard/renfang/resi/class.vue
@@ -9,7 +9,7 @@
       <div class="title_line"></div>
 
       <div v-if="type_id == 'special_popu'" class="second-select">
-        <el-select v-model="subclassId" :popper-append-to-body="false" placeholder="请选择">
+        <el-select v-model.trim="subclassId" :popper-append-to-body="false" placeholder="请选择">
           <el-option v-for="item in subclassList" :key="item.value" :label="item.label" :value="item.value"
                      @click.native="handleChangeDate(item.value)"></el-option>
         </el-select>
diff --git a/src/views/dataBoard/renfang/resi/classNew.vue b/src/views/dataBoard/renfang/resi/classNew.vue
index 98a46c470..4e90bb085 100644
--- a/src/views/dataBoard/renfang/resi/classNew.vue
+++ b/src/views/dataBoard/renfang/resi/classNew.vue
@@ -15,7 +15,7 @@
       <div class="second-select" v-if="type == 'old'">
         <el-select
           @change="changeOld"
-          v-model="oldValsss"
+          v-model.trim="oldValsss"
           :popper-append-to-body="false"
           :clearable="true"
           placeholder="请选择年龄"
@@ -29,7 +29,7 @@
         </el-select>
         &nbsp;
         <el-select
-          v-model="searchParams.resideSituation"
+          v-model.trim="searchParams.resideSituation"
           :popper-append-to-body="false"
           :clearable="true"
           @change="changeSearch"
@@ -45,7 +45,7 @@
         &nbsp;
         <el-select
           @change="changeSearch"
-          v-model="searchParams.serviceType"
+          v-model.trim="searchParams.serviceType"
           :popper-append-to-body="false"
           :clearable="true"
           placeholder="请选择服务类型"
@@ -60,7 +60,7 @@
       </div>
       <div class="second-select" v-if="type == 'dibao'">
         <el-select
-          v-model="searchParams.lowIncomeType"
+          v-model.trim="searchParams.lowIncomeType"
           :popper-append-to-body="false"
           :clearable="true"
           @change="changeSearch"
@@ -75,7 +75,7 @@
         </el-select>
         &nbsp;
         <el-select
-          v-model="searchParams.lowIncomeReason"
+          v-model.trim="searchParams.lowIncomeReason"
           :popper-append-to-body="false"
           :clearable="true"
           @change="changeSearch"
@@ -92,7 +92,7 @@
         &nbsp;
         <el-select
           @change="changeSearch"
-          v-model="searchParams.serviceType"
+          v-model.trim="searchParams.serviceType"
           :popper-append-to-body="false"
           :clearable="true"
           placeholder="请选择服务类型"
@@ -108,7 +108,7 @@
       <div class="second-select" v-if="type == 'zhiyuanzhe'">
         <el-select
           @change="changeOld"
-          v-model="oldValsss"
+          v-model.trim="oldValsss"
           :popper-append-to-body="false"
           :clearable="true"
           placeholder="请选择年龄"
@@ -122,7 +122,7 @@
         </el-select>
         &nbsp;
         <el-select
-          v-model="searchParams.gategoryCode"
+          v-model.trim="searchParams.gategoryCode"
           :popper-append-to-body="false"
           :clearable="true"
           @change="changeSearch"
@@ -139,7 +139,7 @@
         &nbsp;
         <el-select
           @change="changeSearch"
-          v-model="searchParams.serviceType"
+          v-model.trim="searchParams.serviceType"
           :popper-append-to-body="false"
           :clearable="true"
           placeholder="请选择服务类型"
@@ -155,7 +155,7 @@
       <div class="second-select" v-if="type == 'dangyuan'">
         <el-select
           @change="changeOld"
-          v-model="oldValsss"
+          v-model.trim="oldValsss"
           :popper-append-to-body="false"
           :clearable="true"
           placeholder="请选择年龄"
@@ -169,7 +169,7 @@
         </el-select>
         &nbsp;
         <el-select
-          v-model="searchParams.cultureLevel"
+          v-model.trim="searchParams.cultureLevel"
           :popper-append-to-body="false"
           :clearable="true"
           @change="changeSearch"
@@ -186,7 +186,7 @@
         &nbsp;
         <el-select
           @change="changeSearch"
-          v-model="searchParams.serviceType"
+          v-model.trim="searchParams.serviceType"
           :popper-append-to-body="false"
           :clearable="true"
           placeholder="请选择服务类型"
@@ -202,7 +202,7 @@
       <div class="second-select" v-if="type == 'shiye'">
         <el-select
           @change="changeOld"
-          v-model="oldValsss"
+          v-model.trim="oldValsss"
           :popper-append-to-body="false"
           :clearable="true"
           placeholder="请选择年龄"
@@ -216,7 +216,7 @@
         </el-select>
         &nbsp;
         <el-select
-          v-model="searchParams.employmentWish"
+          v-model.trim="searchParams.employmentWish"
           :popper-append-to-body="false"
           :clearable="true"
           @change="changeSearch"
@@ -231,7 +231,7 @@
         </el-select>
         &nbsp;
         <el-select
-          v-model="searchParams.unemploymentReason"
+          v-model.trim="searchParams.unemploymentReason"
           :popper-append-to-body="false"
           :clearable="true"
           @change="changeSearch"
@@ -248,7 +248,7 @@
         &nbsp;
         <el-select
           @change="changeSearch"
-          v-model="searchParams.serviceType"
+          v-model.trim="searchParams.serviceType"
           :popper-append-to-body="false"
           :clearable="true"
           placeholder="请选择服务类型"
@@ -264,7 +264,7 @@
       <div class="second-select" v-if="type == 'special'">
         <el-select
           @change="changeSearch"
-          v-model="searchParams.serviceType"
+          v-model.trim="searchParams.serviceType"
           :popper-append-to-body="false"
           :clearable="true"
           placeholder="请选择服务类型"
@@ -288,7 +288,7 @@
       >
         <el-input
           type="text"
-          v-model="searchParams.serviceOrgName"
+          v-model.trim="searchParams.serviceOrgName"
           :clearable="true"
           placeholder="请输入服务组织名称"
           @blur="changeFwfmc"
diff --git a/src/views/dataBoard/satisfactionEval/Problem/tddtlxsj/list.vue b/src/views/dataBoard/satisfactionEval/Problem/tddtlxsj/list.vue
index a0e6b85fe..0f3170ec1 100644
--- a/src/views/dataBoard/satisfactionEval/Problem/tddtlxsj/list.vue
+++ b/src/views/dataBoard/satisfactionEval/Problem/tddtlxsj/list.vue
@@ -4,7 +4,7 @@
     <div class="screen">
       <el-form :model="queryParams" inline>
         <el-select
-            v-model="typeCondition"
+            v-model.trim="typeCondition"
             class="select"
             placeholder="请选择"
             popper-class="selectPopClass"
diff --git a/src/views/dataBoard/satisfactionEval/Problem/tyqybtlx/list.vue b/src/views/dataBoard/satisfactionEval/Problem/tyqybtlx/list.vue
index 2d5e2dcd3..a8c467cb9 100644
--- a/src/views/dataBoard/satisfactionEval/Problem/tyqybtlx/list.vue
+++ b/src/views/dataBoard/satisfactionEval/Problem/tyqybtlx/list.vue
@@ -4,7 +4,7 @@
     <div class="screen">
       <el-form :model="queryParams" inline>
         <el-select
-            v-model="typeCondition"
+            v-model.trim="typeCondition"
             class="select"
             placeholder="请选择"
             popper-class="selectPopClass"
diff --git a/src/views/dataBoard/satisfactionEval/Problem/tyry/list.vue b/src/views/dataBoard/satisfactionEval/Problem/tyry/list.vue
index a3abd4a35..ac7778502 100644
--- a/src/views/dataBoard/satisfactionEval/Problem/tyry/list.vue
+++ b/src/views/dataBoard/satisfactionEval/Problem/tyry/list.vue
@@ -4,7 +4,7 @@
     <div class="screen">
       <el-form :model="queryParams" inline>
         <el-select
-            v-model="typeCondition"
+            v-model.trim="typeCondition"
             class="select"
             placeholder="请选择"
             popper-class="selectPopClass"
diff --git a/src/views/dataBoard/satisfactionEval/dissatisfieReason/detail.vue b/src/views/dataBoard/satisfactionEval/dissatisfieReason/detail.vue
index 4f9be56e3..a923cf926 100644
--- a/src/views/dataBoard/satisfactionEval/dissatisfieReason/detail.vue
+++ b/src/views/dataBoard/satisfactionEval/dissatisfieReason/detail.vue
@@ -26,7 +26,7 @@
         <div class="problem-list">
           <div class="problem-item">
             <div class="problem-title">1、您对本社区的文化设施建设情况</div>
-            <el-radio-group disabled v-model="detail.evaCulturalFacility">
+            <el-radio-group disabled v-model.trim="detail.evaCulturalFacility">
               <el-radio label="veryGood">满意</el-radio>
               <el-radio label="good">基本满意</el-radio>
               <el-radio label="bad">不满意</el-radio>
@@ -34,7 +34,7 @@
           </div>
           <div class="problem-item">
             <div class="problem-title">1.1、您具体对哪些方面不满意？请详细说明原因。</div>
-            <el-radio-group disabled v-model="detail.culturalFacilityAsp">
+            <el-radio-group disabled v-model.trim="detail.culturalFacilityAsp">
               <el-radio label="culturalFacilityAsp01">社区文化广场</el-radio>
               <el-radio label="culturalFacilityAsp02">图书阅览室</el-radio>
               <el-radio label="culturalFacilityAsp03">文艺演出</el-radio>
@@ -44,7 +44,7 @@
           </div>
           <div class="problem-item">
             <div class="problem-title">2、您对本社区的体育健身设施、组织开展的健身活动、比赛等体育活动是否满意?</div>
-            <el-radio-group disabled v-model="detail.evaSportsFacility">
+            <el-radio-group disabled v-model.trim="detail.evaSportsFacility">
               <el-radio label="veryGood">满意</el-radio>
               <el-radio label="good">基本满意</el-radio>
               <el-radio label="bad">不满意</el-radio>
@@ -52,7 +52,7 @@
           </div>
           <div class="problem-item">
             <div class="problem-title">2.1、您具体对哪些方面不满意？请详细说明原因。</div>
-            <el-radio-group disabled v-model="detail.sportsFacilityAsp">
+            <el-radio-group disabled v-model.trim="detail.sportsFacilityAsp">
               <el-radio label="sportsFacilityAsp01">社区健身器材</el-radio>
               <el-radio label="sportsFacilityAsp02">健身运动</el-radio>
               <el-radio label="sportsFacilityAsp03">体育活动</el-radio>
@@ -62,7 +62,7 @@
           </div>
           <div class="problem-item">
             <div class="problem-title">3、您对本社区的幼儿园保育教育质量，小学/初中数学质量以及师德师风方面是否满意？</div>
-            <el-radio-group disabled v-model=detail.evaBasicEducation>
+            <el-radio-group disabled v-model.trim=detail.evaBasicEducation>
               <el-radio label="veryGood">满意</el-radio>
               <el-radio label="good">基本满意</el-radio>
               <el-radio label="bad">不满意</el-radio>
@@ -73,7 +73,7 @@
 
           <div class="problem-item">
             <div class="problem-title">4、您对本社区的医疗机构便利程度、医务人员的服务态度是否满意？</div>
-            <el-radio-group disabled v-model="detail.evaMedical">
+            <el-radio-group disabled v-model.trim="detail.evaMedical">
               <el-radio label="veryGood">满意</el-radio>
               <el-radio label="good">基本满意</el-radio>
               <el-radio label="bad">不满意</el-radio>
@@ -82,7 +82,7 @@
 
           <div class="problem-item">
             <div class="problem-title">4.1、您具体对哪些方面不满意？请详细说明原因。</div>
-            <el-radio-group disabled v-model="detail.medicalAsp">
+            <el-radio-group disabled v-model.trim="detail.medicalAsp">
               <el-radio label="medicalAsp01">挂号缴费</el-radio>
               <el-radio label="medicalAsp02">检查化验</el-radio>
               <el-radio label="medicalAsp03">其他</el-radio>
@@ -92,7 +92,7 @@
 
           <div class="problem-item">
             <div class="problem-title">5、您对本社区的养老院建设和服务、居家社区养老服务等方面是否满意？</div>
-            <el-radio-group disabled v-model="detail.evaOldPeopleProvide">
+            <el-radio-group disabled v-model.trim="detail.evaOldPeopleProvide">
               <el-radio label="veryGood">满意</el-radio>
               <el-radio label="good">基本满意</el-radio>
               <el-radio label="bad">不满意</el-radio>
@@ -101,7 +101,7 @@
 
           <div class="problem-item">
             <div class="problem-title">5.1、您具体对哪些方面不满意？请详细说明原因。</div>
-            <el-radio-group disabled v-model="detail.oldPeopleProvideAsp">
+            <el-radio-group disabled v-model.trim="detail.oldPeopleProvideAsp">
               <el-radio label="oldPeopleProvideAsp01">社区老年人活动场所</el-radio>
               <el-radio label="oldPeopleProvideAsp02">社区为老服务</el-radio>
               <el-radio label="oldPeopleProvideAsp03">居家养老服务</el-radio>
@@ -112,7 +112,7 @@
 
           <div class="problem-item">
             <div class="problem-title">6、您对本社区的社会救助和服务态度以及困难家庭住房保障工作是否满意？</div>
-            <el-radio-group disabled v-model="detail.evaSocialAssistance">
+            <el-radio-group disabled v-model.trim="detail.evaSocialAssistance">
               <el-radio label="veryGood">满意</el-radio>
               <el-radio label="good">基本满意</el-radio>
               <el-radio label="bad">不满意</el-radio>
@@ -121,7 +121,7 @@
 
           <div class="problem-item">
             <div class="problem-title">6.1、您具体对哪些方面不满意？请详细说明原因。</div>
-            <el-radio-group disabled v-model="detail.socialAssistanceAsp">
+            <el-radio-group disabled v-model.trim="detail.socialAssistanceAsp">
               <el-radio label="socialAssistanceAsp01">低保、特困、残疾人保障办理便利程度</el-radio>
               <el-radio label="socialAssistanceAsp02">临时救助申请办理便利程度</el-radio>
               <el-radio label="socialAssistanceAsp03">其他</el-radio>
@@ -131,7 +131,7 @@
 
           <div class="problem-item">
             <div class="problem-title">7、您对本社区的空气质量、居住环境、道路情况、停车情况是否满意？</div>
-            <el-radio-group disabled v-model="detail.evaEcologicalEnv">
+            <el-radio-group disabled v-model.trim="detail.evaEcologicalEnv">
               <el-radio label="veryGood">满意</el-radio>
               <el-radio label="good">基本满意</el-radio>
               <el-radio label="bad">不满意</el-radio>
@@ -140,7 +140,7 @@
 
           <div class="problem-item">
             <div class="problem-title">7.1、您具体对哪些方面不满意？请详细说明原因。</div>
-            <el-radio-group disabled v-model="detail.ecologicalEnvAsp">
+            <el-radio-group disabled v-model.trim="detail.ecologicalEnvAsp">
               <el-radio label="ecologicalEnvAsp01">废气、异味、工地扬尘</el-radio>
               <el-radio label="ecologicalEnvAsp02">楼院卫生</el-radio>
               <el-radio label="ecologicalEnvAsp03">乱停车</el-radio>
@@ -154,7 +154,7 @@
             <div class="problem-title">
               8、您对本社区的公安机关打击违法犯罪活动、开展巡逻执勤、维护治安秩序等安全防范工作方面是否满意？
             </div>
-            <el-radio-group disabled v-model="detail.evaSocialSecurity">
+            <el-radio-group disabled v-model.trim="detail.evaSocialSecurity">
               <el-radio label="veryGood">满意</el-radio>
               <el-radio label="good">基本满意</el-radio>
               <el-radio label="bad">不满意</el-radio>
@@ -165,7 +165,7 @@
             <div class="problem-title">
               8、您对本社区的公安机关打击违法犯罪活动、开展巡逻执勤、维护治安秩序等安全防范工作方面是否满意？
             </div>
-            <el-radio-group disabled v-model="detail.socialSecurityAsp">
+            <el-radio-group disabled v-model.trim="detail.socialSecurityAsp">
               <el-radio label="socialSecurityAsp01">扫黑除恶</el-radio>
               <el-radio label="socialSecurityAsp02">打击犯罪</el-radio>
               <el-radio label="socialSecurityAsp03">保护人身财产安全</el-radio>
@@ -191,7 +191,7 @@
 
           <div class="problem-item">
             <div class="problem-title">11、您是否接受回访？</div>
-            <el-radio-group disabled v-model="reporter.followUpStatus">
+            <el-radio-group disabled v-model.trim="reporter.followUpStatus">
               <el-radio :label="-1">接受回访</el-radio>
               <el-radio :label="1">不接受回访</el-radio>
             </el-radio-group>
@@ -200,7 +200,7 @@
 
           <div class="problem-item">
             <div class="problem-title">12、请选择合适您的回访方式</div>
-            <el-radio-group disabled v-model="reporter.expectFollowUpWay">
+            <el-radio-group disabled v-model.trim="reporter.expectFollowUpWay">
               <el-radio label="1">电话回访</el-radio>
               <el-radio label="2">工作人员上门回访</el-radio>
             </el-radio-group>
@@ -208,7 +208,7 @@
 <!--          <div class="problem-item">
             <div class="problem-title">请填写您在社区的家庭住址</div>
             <div class="select">
-              <el-select v-model="value" class="select" filterable placeholder="选择所在小区"
+              <el-select v-model.trim="value" class="select" filterable placeholder="选择所在小区"
                          popper-class="selectPopClass">
                 <el-option
                     v-for="item in options"
@@ -217,7 +217,7 @@
                     :value="item.value">
                 </el-option>
               </el-select>
-              <el-select v-model="value" class="select" filterable placeholder="楼栋" popper-class="selectPopClass">
+              <el-select v-model.trim="value" class="select" filterable placeholder="楼栋" popper-class="selectPopClass">
                 <el-option
                     v-for="item in options"
                     :key="item.value"
@@ -225,7 +225,7 @@
                     :value="item.value">
                 </el-option>
               </el-select>
-              <el-select v-model="value" class="select" filterable placeholder="单元" popper-class="selectPopClass">
+              <el-select v-model.trim="value" class="select" filterable placeholder="单元" popper-class="selectPopClass">
                 <el-option
                     v-for="item in options"
                     :key="item.value"
@@ -233,7 +233,7 @@
                     :value="item.value">
                 </el-option>
               </el-select>
-              <el-select v-model="value" class="select" filterable placeholder="门牌号" popper-class="selectPopClass">
+              <el-select v-model.trim="value" class="select" filterable placeholder="门牌号" popper-class="selectPopClass">
                 <el-option
                     v-for="item in options"
                     :key="item.value"
diff --git a/src/views/dataBoard/satisfactionEval/dissatisfieReason/index.vue b/src/views/dataBoard/satisfactionEval/dissatisfieReason/index.vue
index 6c912caf3..3012d23ef 100644
--- a/src/views/dataBoard/satisfactionEval/dissatisfieReason/index.vue
+++ b/src/views/dataBoard/satisfactionEval/dissatisfieReason/index.vue
@@ -4,7 +4,7 @@
     <div class="screen">
       <el-form :model="queryParams" inline>
         <el-date-picker
-            v-model="queryParams.month"
+            v-model.trim="queryParams.period"
             :append-to-body="false"
             placeholder="按月度"
             popper-class="date-current-weiyi"
@@ -14,7 +14,7 @@
         />
 
         <el-select
-            v-model="queryParams.agencyId"
+            v-model.trim="queryParams.agencyId"
             placeholder="按组织"
             popper-class="selectPopClass"
             size="small"
@@ -88,7 +88,7 @@ export default {
   data() {
     return {
       queryParams: {
-        month: "",
+        period: "",
         agencyId: "",
         pageNo: 1,
         pageSize: 10,
diff --git a/src/views/dataBoard/satisfactionEval/dissatisfied/index.vue b/src/views/dataBoard/satisfactionEval/dissatisfied/index.vue
index a87e1a6be..b3af6d389 100644
--- a/src/views/dataBoard/satisfactionEval/dissatisfied/index.vue
+++ b/src/views/dataBoard/satisfactionEval/dissatisfied/index.vue
@@ -3,17 +3,17 @@
     <Breadcrumb :list="breadcrumbList" />
     <div class="screen">
       <el-form :model="queryParams" inline>
-        <el-date-picker v-if="!hideSearch" size="small" popper-class="date-current-weiyi" :append-to-body="false" v-model="queryParams.month" type="month" value-format="yyyy-MM" placeholder="按月度"> </el-date-picker>
+        <el-date-picker v-if="!hideSearch" size="small" popper-class="date-current-weiyi" :append-to-body="false" v-model.trim="queryParams.month" type="month" value-format="yyyy-MM" placeholder="按月度"> </el-date-picker>
 
-        <el-select v-if="!hideSearch" popper-class="selectPopClass" v-model="queryParams.agencyId" size="small" placeholder="按组织">
+        <el-select v-if="!hideSearch" popper-class="selectPopClass" v-model.trim="queryParams.agencyId" size="small" placeholder="按组织">
           <el-option v-for="item in orgOptions" :key="item.value" :label="item.label" :value="item.value"> </el-option>
         </el-select>
 
-        <el-select class="searchSelect" popper-class="selectPopClass" clearable collapse-tags multiple v-model="queryParams.satisfactionSource" size="small" placeholder="按不满意事项来源" @change="getSatisfactionCategoryOptions">
+        <el-select class="searchSelect" popper-class="selectPopClass" clearable collapse-tags multiple v-model.trim="queryParams.satisfactionSource" size="small" placeholder="按不满意事项来源" @change="getSatisfactionCategoryOptions">
           <el-option v-for="item in satisfactionSourceOptions" :key="item.value" :label="item.label" :value="item.value"> </el-option>
         </el-select>
 
-        <el-select popper-class="selectPopClass" clearable v-model="queryParams.satisfactionCategory" size="small" placeholder="按不满意事项类型">
+        <el-select popper-class="selectPopClass" clearable v-model.trim="queryParams.satisfactionCategory" size="small" placeholder="按不满意事项类型">
           <el-option v-for="item in satisfactionCategoryOptions" :key="item.value" :label="item.label" :value="item.value"> </el-option>
         </el-select>
         <el-input v-model.trim="queryParams.name" size="small" placeholder="按人员姓名"></el-input>
diff --git a/src/views/dataBoard/satisfactionEval/index.vue b/src/views/dataBoard/satisfactionEval/index.vue
index 35159e098..fbbfcb17d 100644
--- a/src/views/dataBoard/satisfactionEval/index.vue
+++ b/src/views/dataBoard/satisfactionEval/index.vue
@@ -27,7 +27,7 @@
             size="small"
             popper-class="date-current-weiyi"
             :append-to-body="false"
-            v-model="scoreMonth"
+            v-model.trim="scoreMonth"
             type="month"
             value-format="yyyy-MM-dd"
             value="yyyy-MM"
diff --git a/src/views/dataBoard/satisfactionEval/modules/PersonnelPortrait/index.vue b/src/views/dataBoard/satisfactionEval/modules/PersonnelPortrait/index.vue
index 4c15cb62f..6611c2506 100644
--- a/src/views/dataBoard/satisfactionEval/modules/PersonnelPortrait/index.vue
+++ b/src/views/dataBoard/satisfactionEval/modules/PersonnelPortrait/index.vue
@@ -1,9 +1,9 @@
 <template>
   <div class="personnel-portrait" v-loading="loading" element-loading-text="加载中..." element-loading-spinner="el-icon-loading" element-loading-background="rgba(0,0,0,0.5)">
-    <Tabs v-model="resultType" :list="resultTypeList" @changeVal="resultTypeChange" />
+    <Tabs v-model.trim="resultType" :list="resultTypeList" @changeVal="resultTypeChange" />
     <div class="screen">
       <div class="txt">已有不满意人群画像</div>
-      <el-select v-if="resultType == 'provinceAndSelf'" v-model="typeCondition" @change="getData" placeholder="请选择" class="select" popper-class="selectPopClass">
+      <el-select v-if="resultType == 'provinceAndSelf'" v-model.trim="typeCondition" @change="getData" placeholder="请选择" class="select" popper-class="selectPopClass">
         <el-option v-for="item in typeConditionList" :key="item.value" :label="item.label" :value="item.value"> </el-option>
       </el-select>
     </div>
@@ -171,6 +171,7 @@ export default {
         this.gridName = data.gridName;
         this.service = data.service;
         this.monthIncomeLevel = data.monthIncomeLevel;
+        this.residentTagArray = [];
         if(data.residentTagName){
           this.residentTagArray = data.residentTagName.split(",");
         }
diff --git a/src/views/dataBoard/satisfactionEval/modules/SelfTrend/index.vue b/src/views/dataBoard/satisfactionEval/modules/SelfTrend/index.vue
index f64c3bd87..2962bbc30 100644
--- a/src/views/dataBoard/satisfactionEval/modules/SelfTrend/index.vue
+++ b/src/views/dataBoard/satisfactionEval/modules/SelfTrend/index.vue
@@ -4,7 +4,7 @@
        element-loading-spinner="el-icon-loading"
        element-loading-background="rgba(0,0,0,0.5)">
     <div class="screen">
-      <Tabs v-model="trendType" :list="trendTypeList" @changeVal="trendTypeChange"/>
+      <Tabs v-model.trim="trendType" :list="trendTypeList" @changeVal="trendTypeChange"/>
     </div>
     <div id="selfTrendChart" style="height: 243px;"></div>
   </div>
diff --git a/src/views/dataBoard/satisfactionEval/modules/TypesOfDissatisfaction/index.vue b/src/views/dataBoard/satisfactionEval/modules/TypesOfDissatisfaction/index.vue
index 3be19b0c7..d10b5ef27 100644
--- a/src/views/dataBoard/satisfactionEval/modules/TypesOfDissatisfaction/index.vue
+++ b/src/views/dataBoard/satisfactionEval/modules/TypesOfDissatisfaction/index.vue
@@ -1,8 +1,8 @@
 <template>
   <div class="types-dissatisfaction" v-loading="loading" element-loading-text="加载中..." element-loading-spinner="el-icon-loading" element-loading-background="rgba(0,0,0,0.5)">
     <div class="screen">
-      <Tabs v-model="resultType" :list="resultTypeList" @changeVal="resultTypeChange" />
-      <el-select v-model="typeCondition" popper-class="selectPopClass" placeholder="请选择" class="select" @change="timeChange">
+      <Tabs v-model.trim="resultType" :list="resultTypeList" @changeVal="resultTypeChange" />
+      <el-select v-model.trim="typeCondition" popper-class="selectPopClass" placeholder="请选择" class="select" @change="timeChange">
         <el-option v-for="item in typeConditionList" :key="item.value" :label="item.label" :value="item.value"> </el-option>
       </el-select>
     </div>
diff --git a/src/views/dataBoard/satisfactionEval/modules/eventAnalysis/index.vue b/src/views/dataBoard/satisfactionEval/modules/eventAnalysis/index.vue
index 6f38de6a5..5766d1389 100644
--- a/src/views/dataBoard/satisfactionEval/modules/eventAnalysis/index.vue
+++ b/src/views/dataBoard/satisfactionEval/modules/eventAnalysis/index.vue
@@ -2,7 +2,7 @@
   <div style="padding: 20px 10px;">
     <title-small text="同地点同类型事件重复投诉问题">
       <template v-slot:time>
-        <el-select v-model="typeCondition1" class="select" placeholder="请选择" popper-class="selectPopClass"
+        <el-select v-model.trim="typeCondition1" class="select" placeholder="请选择" popper-class="selectPopClass"
                    @change="value=> timeChange(value,1)">
           <el-option v-for="item in typeConditionList" :key="item.value" :label="item.label"
                      :value="item.value"></el-option>
@@ -38,7 +38,7 @@
 
     <title-small text="同一人员重复投诉问题">
       <template v-slot:time>
-        <el-select v-model="typeCondition2" class="select" placeholder="请选择" popper-class="selectPopClass"
+        <el-select v-model.trim="typeCondition2" class="select" placeholder="请选择" popper-class="selectPopClass"
                    @change="value=> timeChange(value,2)">
         <el-option v-for="item in typeConditionList" :key="item.value" :label="item.label"
                      :value="item.value"></el-option>
@@ -86,7 +86,7 @@
 
     <title-small text="同一区域不同类型投诉问题">
       <template v-slot:time>
-        <el-select v-model="typeCondition3" class="select" placeholder="请选择" popper-class="selectPopClass"
+        <el-select v-model.trim="typeCondition3" class="select" placeholder="请选择" popper-class="selectPopClass"
                    @change="value=> timeChange(value,3)">
         <el-option v-for="item in typeConditionList" :key="item.value" :label="item.label"
                      :value="item.value"></el-option>
diff --git a/src/views/dataBoard/satisfactionEval/potentialPeople/index.vue b/src/views/dataBoard/satisfactionEval/potentialPeople/index.vue
index c8c21c7c0..1bea88a12 100644
--- a/src/views/dataBoard/satisfactionEval/potentialPeople/index.vue
+++ b/src/views/dataBoard/satisfactionEval/potentialPeople/index.vue
@@ -5,7 +5,7 @@
       <el-form :model="queryParams" inline>
         <el-select
           popper-class="selectPopClass"
-          v-model="queryParams.agencyId"
+          v-model.trim="queryParams.agencyId"
           size="small"
           placeholder="按组织"
           v-if="this.$route.query.type != 'shuji'"
@@ -19,7 +19,7 @@
         </el-select>
         <el-select
           popper-class="selectPopClass"
-          v-model="queryParams.satisfactionSource"
+          v-model.trim="queryParams.satisfactionSource"
           size="small"
           placeholder="按类型"
           v-else
diff --git a/src/views/dataBoard/sida/fuwu/list.vue b/src/views/dataBoard/sida/fuwu/list.vue
index b916a5d3e..0b045ce90 100644
--- a/src/views/dataBoard/sida/fuwu/list.vue
+++ b/src/views/dataBoard/sida/fuwu/list.vue
@@ -7,12 +7,12 @@
 			<div class="tip_title">{{ tableTitle }}</div>
 			<div class="title_line"></div>
 			<div class="second-select" style="position:absolute;margin-left:300px;">
-				<el-select v-model="listType" @change="changList">
+				<el-select v-model.trim="listType" @change="changList">
 					<el-option value="个性需求">个性需求</el-option>
 					<el-option value="共性需求">共性需求</el-option>
 				</el-select>
 
-				<el-select v-model="type2" @change="init" :clearable="true" class="left10">
+				<el-select v-model.trim="type2" @change="init" :clearable="true" class="left10">
 					<el-option value="全部">全部</el-option>
 					<template v-if="listType == '个性需求'">
 						<el-option value="商家支撑">商家支撑</el-option>
@@ -37,7 +37,7 @@
 						unlink-panels
 						value-format="yyyy-MM-dd"
 						@change="init"
-						v-model="searchDate"
+						v-model.trim="searchDate"
 						range-separator="至"
 						start-placeholder="开始日期"
 						end-placeholder="结束日期"
diff --git a/src/views/dataBoard/sida/index.vue b/src/views/dataBoard/sida/index.vue
index db3c1b64a..0f16be5f0 100644
--- a/src/views/dataBoard/sida/index.vue
+++ b/src/views/dataBoard/sida/index.vue
@@ -25,7 +25,7 @@
 							unlink-panels
 							value-format="yyyy-MM-dd"
 							@change="searchDateChang()"
-							v-model="searchDate"
+							v-model.trim="searchDate"
 							range-separator="至"
 							start-placeholder="开始日期"
 							end-placeholder="结束日期"
diff --git a/src/views/dataBoard/sida/wt/eventList.vue b/src/views/dataBoard/sida/wt/eventList.vue
index fe9eac9a5..d91218eb9 100644
--- a/src/views/dataBoard/sida/wt/eventList.vue
+++ b/src/views/dataBoard/sida/wt/eventList.vue
@@ -7,7 +7,7 @@
 			<div class="tip_title">{{ tableTitle }}</div>
 			<div class="title_line"></div>
 			<div class="second-select" style="position:absolute;margin-left:300px;">
-				<el-select v-model="type2" @change="init" :clearable="true">
+				<el-select v-model.trim="type2" @change="init" :clearable="true">
 					<el-option value="全部">全部</el-option>
 					<el-option value="普通事件">普通事件</el-option>
 					<el-option value="难点痛点">难点痛点</el-option>
@@ -20,7 +20,7 @@
 						unlink-panels
 						value-format="yyyy-MM-dd"
 						@change="init"
-						v-model="searchDate"
+						v-model.trim="searchDate"
 						range-separator="至"
 						start-placeholder="开始日期"
 						end-placeholder="结束日期"
diff --git a/src/views/dataBoard/sida/wt/hiddenDangerList.vue b/src/views/dataBoard/sida/wt/hiddenDangerList.vue
index 7096412ea..294e0efeb 100644
--- a/src/views/dataBoard/sida/wt/hiddenDangerList.vue
+++ b/src/views/dataBoard/sida/wt/hiddenDangerList.vue
@@ -7,7 +7,7 @@
 			<div class="tip_title">{{ tableTitle }}</div>
 			<div class="title_line"></div>
 			<div class="second-select" style="position:absolute;margin-left:300px;">
-				<el-select v-model="type2" @change="init" :clearable="true">
+				<el-select v-model.trim="type2" @change="init" :clearable="true">
 					<el-option value="全部">全部</el-option>
 					<el-option value="生产隐患">生产隐患</el-option>
 					<el-option value="群租房">群租房</el-option>
@@ -20,7 +20,7 @@
 						unlink-panels
 						value-format="yyyy-MM-dd"
 						@change="init"
-						v-model="searchDate"
+						v-model.trim="searchDate"
 						range-separator="至"
 						start-placeholder="开始日期"
 						end-placeholder="结束日期"
diff --git a/src/views/dataBoard/sida/wt/specialCategoryList.vue b/src/views/dataBoard/sida/wt/specialCategoryList.vue
index c32843cb7..a272b4ef0 100644
--- a/src/views/dataBoard/sida/wt/specialCategoryList.vue
+++ b/src/views/dataBoard/sida/wt/specialCategoryList.vue
@@ -7,7 +7,7 @@
 			<div class="tip_title">{{ tableTitle }}</div>
 			<div class="title_line"></div>
 			<div class="second-select" style="position:absolute;margin-left:300px;">
-				<el-select v-model="type2" @change="init" :clearable="true">
+				<el-select v-model.trim="type2" @change="init" :clearable="true">
 					<el-option value="全部">全部</el-option>
 					<el-option value="信访人员">信访人员</el-option>
 					<el-option value="安置帮教">安置帮教</el-option>
@@ -24,7 +24,7 @@
 						unlink-panels
 						value-format="yyyy-MM-dd"
 						@change="init"
-						v-model="searchDate"
+						v-model.trim="searchDate"
 						range-separator="至"
 						start-placeholder="开始日期"
 						end-placeholder="结束日期"
diff --git a/src/views/dataBoard/sida/xq/list.vue b/src/views/dataBoard/sida/xq/list.vue
index fc8588bb1..1737d5552 100644
--- a/src/views/dataBoard/sida/xq/list.vue
+++ b/src/views/dataBoard/sida/xq/list.vue
@@ -7,12 +7,12 @@
 			<div class="tip_title">{{ tableTitle }}</div>
 			<div class="title_line"></div>
 			<div class="second-select" style="position:absolute;margin-left:300px;">
-				<el-select v-model="listType" @change="changList">
+				<el-select v-model.trim="listType" @change="changList">
 					<el-option value="个性需求">个性需求</el-option>
 					<el-option value="共性需求">共性需求</el-option>
 				</el-select>
 
-				<el-select v-model="type2" @change="init" :clearable="true" class="left10">
+				<el-select v-model.trim="type2" @change="init" :clearable="true" class="left10">
 					
 					<template v-if="listType == '个性需求'">
 						<el-option value="全部">全部</el-option>
@@ -39,7 +39,7 @@
 						unlink-panels
 						value-format="yyyy-MM-dd"
 						@change="init"
-						v-model="searchDate"
+						v-model.trim="searchDate"
 						range-separator="至"
 						start-placeholder="开始日期"
 						end-placeholder="结束日期"
diff --git a/src/views/dataBoard/sida/zy/goodsResList.vue b/src/views/dataBoard/sida/zy/goodsResList.vue
index d46422cdd..e2b80bc26 100644
--- a/src/views/dataBoard/sida/zy/goodsResList.vue
+++ b/src/views/dataBoard/sida/zy/goodsResList.vue
@@ -7,7 +7,7 @@
 			<div class="tip_title">{{ tableTitle }}</div>
 			<div class="title_line"></div>
 			<div class="second-select" style="position:absolute;margin-left:300px;">
-				<el-select v-model="type2" @change="init" :clearable="true">
+				<el-select v-model.trim="type2" @change="init" :clearable="true">
 					<el-option value="all" label="全部"></el-option>
 					<el-option value="safety_emergency_equipment" label="公共服务设备"></el-option>
 					<el-option value="common_service_equipment" label="安全应急设备"></el-option>
@@ -20,7 +20,7 @@
 						unlink-panels
 						value-format="yyyy-MM-dd"
 						@change="init"
-						v-model="searchDate"
+						v-model.trim="searchDate"
 						range-separator="至"
 						start-placeholder="开始日期"
 						end-placeholder="结束日期"
diff --git a/src/views/dataBoard/sida/zy/peopleResList.vue b/src/views/dataBoard/sida/zy/peopleResList.vue
index d166350c0..3195a95f8 100644
--- a/src/views/dataBoard/sida/zy/peopleResList.vue
+++ b/src/views/dataBoard/sida/zy/peopleResList.vue
@@ -7,7 +7,7 @@
 			<div class="tip_title">{{ tableTitle }}</div>
 			<div class="title_line"></div>
 			<div class="second-select" style="position:absolute;margin-left:300px;">
-				<el-select v-model="type2" @change="init" :clearable="true">
+				<el-select v-model.trim="type2" @change="init" :clearable="true">
 					<!-- all\volunteer\community_org\party_unit -->
 					<el-option value="all" label="全部"></el-option>
 					<el-option value="volunteer" label="志愿者"></el-option>
@@ -21,7 +21,7 @@
 						unlink-panels
 						value-format="yyyy-MM-dd"
 						@change="init"
-						v-model="searchDate"
+						v-model.trim="searchDate"
 						range-separator="至"
 						start-placeholder="开始日期"
 						end-placeholder="结束日期"
diff --git a/src/views/dataBoard/sida/zy/placeResList.vue b/src/views/dataBoard/sida/zy/placeResList.vue
index 9cdc4d750..ea1f9967c 100644
--- a/src/views/dataBoard/sida/zy/placeResList.vue
+++ b/src/views/dataBoard/sida/zy/placeResList.vue
@@ -7,7 +7,7 @@
 			<div class="tip_title">{{ tableTitle }}</div>
 			<div class="title_line"></div>
 			<div class="second-select" style="position:absolute;margin-left:300px;">
-				<el-select v-model="type2" @change="init" :clearable="true">
+				<el-select v-model.trim="type2" @change="init" :clearable="true">
 					<el-option value="enterprise" label="安全生产场所"></el-option>
 					<el-option value="city_management" label="城市管理"></el-option>
 					<el-option value="emergency_sites" label="应急场所"></el-option>
@@ -19,7 +19,7 @@
 						unlink-panels
 						value-format="yyyy-MM-dd"
 						@change="init"
-						v-model="searchDate"
+						v-model.trim="searchDate"
 						range-separator="至"
 						start-placeholder="开始日期"
 						end-placeholder="结束日期"
diff --git a/src/views/dataBoardMain/main-navbar.vue b/src/views/dataBoardMain/main-navbar.vue
index b2c5b9272..352d12627 100644
--- a/src/views/dataBoardMain/main-navbar.vue
+++ b/src/views/dataBoardMain/main-navbar.vue
@@ -6,7 +6,7 @@
     <div class="title">
       <div class="title-txt">{{ customerName }}智能分析平台</div>
       <div class="selectArea" v-if="$route.path == '/dataBoard/satisfactionEval/index'">
-        <el-select :style="{ width: selectWidth + 'px' }" @change="setSelectName" v-model="value" popper-class="selectPopClass">
+        <el-select :style="{ width: selectWidth + 'px' }" @change="setSelectName" v-model.trim="value" popper-class="selectPopClass">
           <el-option v-for="(item, index) in options" v-if="item.agencyLevel !== 'grid'" :key="item.value" :label="item.label" :value="item.value" />
         </el-select>
       </div>
diff --git a/src/views/main-content.vue b/src/views/main-content.vue
index 6c46d21b5..edaeac288 100644
--- a/src/views/main-content.vue
+++ b/src/views/main-content.vue
@@ -18,7 +18,7 @@
         </el-dropdown-menu>
       </el-dropdown>
       <el-tabs
-        v-model="$store.state.contentTabsActiveName"
+        v-model.trim="$store.state.contentTabsActiveName"
         @tab-click="tabSelectedHandle"
         @tab-remove="tabRemoveHandle"
       >
diff --git a/src/views/main-navbar-update-password-work.vue b/src/views/main-navbar-update-password-work.vue
index e5022045b..ec076a22e 100644
--- a/src/views/main-navbar-update-password-work.vue
+++ b/src/views/main-navbar-update-password-work.vue
@@ -18,7 +18,7 @@
       </el-form-item>
       <el-form-item prop="password" :label="$t('updatePassword.password')">
         <el-input
-          v-model="dataForm.password"
+          v-model.trim="dataForm.password"
           type="password"
           :placeholder="$t('updatePassword.password')"
         ></el-input>
@@ -28,7 +28,7 @@
         :label="$t('updatePassword.newPassword')"
       >
         <el-input
-          v-model="dataForm.newPassword"
+          v-model.trim="dataForm.newPassword"
           type="password"
           placeholder="密码必须8-20个字符，而且同时包含大小写字母和数字"
         ></el-input>
@@ -38,7 +38,7 @@
         :label="$t('updatePassword.confirmPassword')"
       >
         <el-input
-          v-model="dataForm.confirmPassword"
+          v-model.trim="dataForm.confirmPassword"
           type="password"
           :placeholder="$t('updatePassword.confirmPassword')"
         ></el-input>
diff --git a/src/views/main-navbar-update-password.vue b/src/views/main-navbar-update-password.vue
index f6edfbfe0..5352f9916 100644
--- a/src/views/main-navbar-update-password.vue
+++ b/src/views/main-navbar-update-password.vue
@@ -14,19 +14,19 @@
       </el-form-item>
       <el-form-item prop="password"
                     :label="$t('updatePassword.password')">
-        <el-input v-model="dataForm.password"
+        <el-input v-model.trim="dataForm.password"
                   type="password"
                   :placeholder="$t('updatePassword.password')"></el-input>
       </el-form-item>
       <el-form-item prop="newPassword"
                     :label="$t('updatePassword.newPassword')">
-        <el-input v-model="dataForm.newPassword"
+        <el-input v-model.trim="dataForm.newPassword"
                   type="password"
                   :placeholder="$t('updatePassword.newPassword')"></el-input>
       </el-form-item>
       <el-form-item prop="confirmPassword"
                     :label="$t('updatePassword.confirmPassword')">
-        <el-input v-model="dataForm.confirmPassword"
+        <el-input v-model.trim="dataForm.confirmPassword"
                   type="password"
                   :placeholder="$t('updatePassword.confirmPassword')"></el-input>
       </el-form-item>
diff --git a/src/views/main-shuju/main-theme-tools.vue b/src/views/main-shuju/main-theme-tools.vue
index 56d051517..d7dddb74d 100644
--- a/src/views/main-shuju/main-theme-tools.vue
+++ b/src/views/main-shuju/main-theme-tools.vue
@@ -9,20 +9,20 @@
       <div class="aui-theme-tools__item">
         <h3>Navbar</h3>
         <el-checkbox
-          v-model="$store.state.navbarLayoutType"
+          v-model.trim="$store.state.navbarLayoutType"
           true-label="colorful"
           >colorful 鲜艳</el-checkbox
         >
       </div>
       <div class="aui-theme-tools__item">
         <h3>Sidebar</h3>
-        <el-checkbox v-model="$store.state.sidebarLayoutSkin" true-label="dark"
+        <el-checkbox v-model.trim="$store.state.sidebarLayoutSkin" true-label="dark"
           >dark 黑色</el-checkbox
         >
       </div>
       <div class="aui-theme-tools__item">
         <h3>Theme</h3>
-        <el-radio-group v-model="themeColor" @change="themeColorChangeHandle">
+        <el-radio-group v-model.trim="themeColor" @change="themeColorChangeHandle">
           <el-radio
             v-for="item in themeList"
             :key="item.name"
diff --git a/src/views/modules/activiti/demo/correction-add-or-update.vue b/src/views/modules/activiti/demo/correction-add-or-update.vue
index b907c3e30..0e5656e6f 100644
--- a/src/views/modules/activiti/demo/correction-add-or-update.vue
+++ b/src/views/modules/activiti/demo/correction-add-or-update.vue
@@ -2,25 +2,25 @@
   <el-dialog :visible.sync="visible" :title="!dataForm.id ? $t('add') : $t('update')" :close-on-click-modal="false" :close-on-press-escape="false">
     <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" :label-width="$i18n.locale === 'en-US' ? '120px' : '80px'">
       <el-form-item :label="$t('correction.post')" prop="applyPost">
-        <el-input v-model="dataForm.applyPost" :placeholder="$t('correction.post')"></el-input>
+        <el-input v-model.trim="dataForm.applyPost" :placeholder="$t('correction.post')"></el-input>
       </el-form-item>
       <el-row :gutter="40">
         <el-col :span="12">
           <el-form-item :label="$t('correction.entryDate')" prop="entryDate">
-            <el-date-picker v-model="dataForm.entryDate" value-format="yyyy-MM-dd" :placeholder="$t('correction.entryDate')" style="width: 100%"></el-date-picker>
+            <el-date-picker v-model.trim="dataForm.entryDate" value-format="yyyy-MM-dd" :placeholder="$t('correction.entryDate')" style="width: 100%"></el-date-picker>
           </el-form-item>
         </el-col>
         <el-col :span="12">
           <el-form-item :label="$t('correction.correctionDate')" prop="correctionDate">
-            <el-date-picker v-model="dataForm.correctionDate" value-format="yyyy-MM-dd" :placeholder="$t('correction.correctionDate')" style="width: 100%"></el-date-picker>
+            <el-date-picker v-model.trim="dataForm.correctionDate" value-format="yyyy-MM-dd" :placeholder="$t('correction.correctionDate')" style="width: 100%"></el-date-picker>
           </el-form-item>
         </el-col>
       </el-row>
       <el-form-item :label="$t('correction.workContent')" prop="workContent">
-        <el-input type="textarea" v-model="dataForm.workContent" :placeholder="$t('correction.workContent')"></el-input>
+        <el-input type="textarea" v-model.trim="dataForm.workContent" :placeholder="$t('correction.workContent')"></el-input>
       </el-form-item>
       <el-form-item :label="$t('correction.achievement')" prop="achievement">
-        <el-input type="textarea" v-model="dataForm.achievement" :placeholder="$t('correction.achievement')"></el-input>
+        <el-input type="textarea" v-model.trim="dataForm.achievement" :placeholder="$t('correction.achievement')"></el-input>
       </el-form-item>
     </el-form>
     <template slot="footer">
diff --git a/src/views/modules/activiti/demo/correction-process.vue b/src/views/modules/activiti/demo/correction-process.vue
index 02a8fc4d8..8be0ae7bc 100644
--- a/src/views/modules/activiti/demo/correction-process.vue
+++ b/src/views/modules/activiti/demo/correction-process.vue
@@ -3,25 +3,25 @@
   <el-card shadow="never" class="aui-card--fill">
       <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" :label-width="$i18n.locale === 'en-US' ? '120px' : '80px'">
           <el-form-item :label="$t('correction.post')" prop="applyPost">
-              <el-input v-model="dataForm.applyPost" :disabled="fieldDisabled" :placeholder="$t('correction.post')"></el-input>
+              <el-input v-model.trim="dataForm.applyPost" :disabled="fieldDisabled" :placeholder="$t('correction.post')"></el-input>
           </el-form-item>
           <el-row :gutter="40">
               <el-col :span="12">
                   <el-form-item :label="$t('correction.entryDate')" prop="entryDate">
-                      <el-date-picker v-model="dataForm.entryDate" :disabled="fieldDisabled" value-format="yyyy-MM-dd" :placeholder="$t('correction.entryDate')" style="width: 100%"></el-date-picker>
+                      <el-date-picker v-model.trim="dataForm.entryDate" :disabled="fieldDisabled" value-format="yyyy-MM-dd" :placeholder="$t('correction.entryDate')" style="width: 100%"></el-date-picker>
                   </el-form-item>
               </el-col>
               <el-col :span="12">
                   <el-form-item :label="$t('correction.correctionDate')" prop="correctionDate">
-                      <el-date-picker v-model="dataForm.correctionDate" :disabled="fieldDisabled" value-format="yyyy-MM-dd" :placeholder="$t('correction.correctionDate')" style="width: 100%"></el-date-picker>
+                      <el-date-picker v-model.trim="dataForm.correctionDate" :disabled="fieldDisabled" value-format="yyyy-MM-dd" :placeholder="$t('correction.correctionDate')" style="width: 100%"></el-date-picker>
                   </el-form-item>
               </el-col>
           </el-row>
           <el-form-item :label="$t('correction.workContent')" prop="workContent">
-              <el-input type="textarea" v-model="dataForm.workContent" :disabled="fieldDisabled" :placeholder="$t('correction.workContent')"></el-input>
+              <el-input type="textarea" v-model.trim="dataForm.workContent" :disabled="fieldDisabled" :placeholder="$t('correction.workContent')"></el-input>
           </el-form-item>
           <el-form-item :label="$t('correction.achievement')" prop="achievement">
-              <el-input type="textarea" v-model="dataForm.achievement" :disabled="fieldDisabled" :placeholder="$t('correction.achievement')"></el-input>
+              <el-input type="textarea" v-model.trim="dataForm.achievement" :disabled="fieldDisabled" :placeholder="$t('correction.achievement')"></el-input>
           </el-form-item>
       </el-form>
       <!--  流程综合组件   -->
diff --git a/src/views/modules/activiti/model-add-or-update.vue b/src/views/modules/activiti/model-add-or-update.vue
index 41673a9e0..f357c8d93 100644
--- a/src/views/modules/activiti/model-add-or-update.vue
+++ b/src/views/modules/activiti/model-add-or-update.vue
@@ -2,13 +2,13 @@
   <el-dialog :visible.sync="visible" :title="!dataForm.id ? $t('add') : $t('update')" :close-on-click-modal="false" :close-on-press-escape="false">
     <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" label-width="120px">
       <el-form-item prop="name" :label="$t('model.name')">
-        <el-input v-model="dataForm.name" :placeholder="$t('model.name')"></el-input>
+        <el-input v-model.trim="dataForm.name" :placeholder="$t('model.name')"></el-input>
       </el-form-item>
       <el-form-item prop="key" :label="$t('model.key')">
-        <el-input v-model="dataForm.key" :placeholder="$t('model.key')"></el-input>
+        <el-input v-model.trim="dataForm.key" :placeholder="$t('model.key')"></el-input>
       </el-form-item>
       <el-form-item prop="description" :label="$t('model.description')">
-        <el-input v-model="dataForm.description" :placeholder="$t('model.description')"></el-input>
+        <el-input v-model.trim="dataForm.description" :placeholder="$t('model.description')"></el-input>
       </el-form-item>
     </el-form>
     <template slot="footer">
diff --git a/src/views/modules/activiti/model.vue b/src/views/modules/activiti/model.vue
index 0fa0e3e5d..1b061c164 100644
--- a/src/views/modules/activiti/model.vue
+++ b/src/views/modules/activiti/model.vue
@@ -3,10 +3,10 @@
     <div class="mod-activiti__model">
       <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
         <el-form-item>
-          <el-input v-model="dataForm.name" :placeholder="$t('model.name')" clearable></el-input>
+          <el-input v-model.trim="dataForm.name" :placeholder="$t('model.name')" clearable></el-input>
         </el-form-item>
         <el-form-item>
-          <el-input v-model="dataForm.key" :placeholder="$t('model.key')" clearable></el-input>
+          <el-input v-model.trim="dataForm.key" :placeholder="$t('model.key')" clearable></el-input>
         </el-form-item>
         <el-form-item>
           <el-button @click="getDataList()">{{ $t('query') }}</el-button>
diff --git a/src/views/modules/activiti/my-apply.vue b/src/views/modules/activiti/my-apply.vue
index c82d54291..4ca9c4d68 100644
--- a/src/views/modules/activiti/my-apply.vue
+++ b/src/views/modules/activiti/my-apply.vue
@@ -3,7 +3,7 @@
     <div class="mod-activiti__process">
       <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
         <el-form-item>
-          <el-input v-model="dataForm.processDefinitionName" :placeholder="$t('process.name')" clearable></el-input>
+          <el-input v-model.trim="dataForm.processDefinitionName" :placeholder="$t('process.name')" clearable></el-input>
         </el-form-item>
         <el-form-item>
           <el-button @click="getDataList()">{{ $t('query') }}</el-button>
diff --git a/src/views/modules/activiti/my-join-task.vue b/src/views/modules/activiti/my-join-task.vue
index ba65fb495..b21b047aa 100644
--- a/src/views/modules/activiti/my-join-task.vue
+++ b/src/views/modules/activiti/my-join-task.vue
@@ -3,7 +3,7 @@
     <div class="mod-activiti__process">
       <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
         <el-form-item>
-          <el-input v-model="dataForm.processDefinitionId" :placeholder="$t('process.name')" clearable></el-input>
+          <el-input v-model.trim="dataForm.processDefinitionId" :placeholder="$t('process.name')" clearable></el-input>
         </el-form-item>
         <el-form-item>
           <el-button @click="getDataList()">{{ $t('query') }}</el-button>
diff --git a/src/views/modules/activiti/my-todo-task-pool.vue b/src/views/modules/activiti/my-todo-task-pool.vue
index 8018899aa..d4a7491a6 100644
--- a/src/views/modules/activiti/my-todo-task-pool.vue
+++ b/src/views/modules/activiti/my-todo-task-pool.vue
@@ -3,7 +3,7 @@
     <div class="mod-activiti__process">
       <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
         <el-form-item>
-          <el-input v-model="dataForm.taskName" :placeholder="$t('process.name')" clearable></el-input>
+          <el-input v-model.trim="dataForm.taskName" :placeholder="$t('process.name')" clearable></el-input>
         </el-form-item>
         <el-form-item>
           <el-button @click="getDataList()">{{ $t('query') }}</el-button>
diff --git a/src/views/modules/activiti/my-todo-task.vue b/src/views/modules/activiti/my-todo-task.vue
index cddf8c3cb..855c6707c 100644
--- a/src/views/modules/activiti/my-todo-task.vue
+++ b/src/views/modules/activiti/my-todo-task.vue
@@ -3,7 +3,7 @@
     <div class="mod-activiti__process">
       <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
         <el-form-item>
-          <el-input v-model="dataForm.taskName" :placeholder="$t('process.name')" clearable></el-input>
+          <el-input v-model.trim="dataForm.taskName" :placeholder="$t('process.name')" clearable></el-input>
         </el-form-item>
         <el-form-item>
           <el-button @click="getDataList()">{{ $t('query') }}</el-button>
diff --git a/src/views/modules/activiti/process-biz-route.vue b/src/views/modules/activiti/process-biz-route.vue
index f3ebcf948..614124078 100644
--- a/src/views/modules/activiti/process-biz-route.vue
+++ b/src/views/modules/activiti/process-biz-route.vue
@@ -2,7 +2,7 @@
   <el-dialog :visible.sync="visible" :title="$t('process.bizRouteSet')" :close-on-click-modal="false" :close-on-press-escape="false">
     <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" :label-width="$i18n.locale === 'en-US' ? '120px' : '80px'">
       <el-form-item :label="$t('process.bizRoute')" prop="bizRoute">
-          <el-input v-model="dataForm.bizRoute" :placeholder="$t('process.bizRoute')"></el-input>
+          <el-input v-model.trim="dataForm.bizRoute" :placeholder="$t('process.bizRoute')"></el-input>
       </el-form-item>
       </el-form>
     <template slot="footer">
diff --git a/src/views/modules/activiti/process-initiation.vue b/src/views/modules/activiti/process-initiation.vue
index ead05425c..06c1cd0d6 100644
--- a/src/views/modules/activiti/process-initiation.vue
+++ b/src/views/modules/activiti/process-initiation.vue
@@ -3,10 +3,10 @@
     <div class="mod-activiti__process">
       <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
         <el-form-item>
-          <el-input v-model="dataForm.processName" :placeholder="$t('process.name')" clearable></el-input>
+          <el-input v-model.trim="dataForm.processName" :placeholder="$t('process.name')" clearable></el-input>
         </el-form-item>
         <el-form-item>
-          <el-input v-model="dataForm.key" :placeholder="$t('process.key')" clearable></el-input>
+          <el-input v-model.trim="dataForm.key" :placeholder="$t('process.key')" clearable></el-input>
         </el-form-item>
         <el-form-item>
           <el-button @click="getDataList()">{{ $t('query') }}</el-button>
diff --git a/src/views/modules/activiti/process.vue b/src/views/modules/activiti/process.vue
index 65741f6f4..c59d986d3 100644
--- a/src/views/modules/activiti/process.vue
+++ b/src/views/modules/activiti/process.vue
@@ -3,10 +3,10 @@
     <div class="mod-activiti__process">
       <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
         <el-form-item>
-          <el-input v-model="dataForm.processName" :placeholder="$t('process.name')" clearable></el-input>
+          <el-input v-model.trim="dataForm.processName" :placeholder="$t('process.name')" clearable></el-input>
         </el-form-item>
         <el-form-item>
-          <el-input v-model="dataForm.key" :placeholder="$t('process.key')" clearable></el-input>
+          <el-input v-model.trim="dataForm.key" :placeholder="$t('process.key')" clearable></el-input>
         </el-form-item>
         <el-form-item>
           <el-button @click="getDataList()">{{ $t('query') }}</el-button>
diff --git a/src/views/modules/activiti/running.vue b/src/views/modules/activiti/running.vue
index f090c5f9f..ce0ffd7df 100644
--- a/src/views/modules/activiti/running.vue
+++ b/src/views/modules/activiti/running.vue
@@ -3,10 +3,10 @@
     <div class="mod-activiti__running">
       <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
         <el-form-item>
-          <el-input v-model="dataForm.id" :placeholder="$t('running.id')" clearable></el-input>
+          <el-input v-model.trim="dataForm.id" :placeholder="$t('running.id')" clearable></el-input>
         </el-form-item>
         <el-form-item>
-          <el-input v-model="dataForm.definitionKey" :placeholder="$t('running.definitionKey')" clearable></el-input>
+          <el-input v-model.trim="dataForm.definitionKey" :placeholder="$t('running.definitionKey')" clearable></el-input>
         </el-form-item>
         <el-form-item>
           <el-button @click="getDataList()">{{ $t('query') }}</el-button>
diff --git a/src/views/modules/base/collect.vue b/src/views/modules/base/collect.vue
index 1c72cc8e6..0a619c007 100644
--- a/src/views/modules/base/collect.vue
+++ b/src/views/modules/base/collect.vue
@@ -29,7 +29,7 @@
         </el-form-item> -->
           <el-form-item label="居住地址"
                         prop="address">
-            <el-input v-model="fmData.address"
+            <el-input v-model.trim="fmData.address"
                       class="u-item-width-normal"
                       size="small"
                       clearable
@@ -38,7 +38,7 @@
           </el-form-item>
           <el-form-item label="户籍地址"
                         prop="domicilePlace">
-            <el-input v-model="fmData.domicilePlace"
+            <el-input v-model.trim="fmData.domicilePlace"
                       class="u-item-width-normal"
                       size="small"
                       clearable
@@ -47,7 +47,7 @@
           </el-form-item>
           <el-form-item label="填写时间"
                         prop="startTime">
-            <el-date-picker v-model="timeRange"
+            <el-date-picker v-model.trim="timeRange"
                             type="daterange"
                             clearable
                             size="small"
@@ -253,13 +253,13 @@
           <el-form-item label="户主姓名"
                         prop="houseHolderName">
             <!-- <el-input class="item_width_1"
-                        v-model="dataForm.houseHolderName">
+                        v-model.trim="dataForm.houseHolderName">
               </el-input> -->
             <div class="wd50">{{ dataForm.houseHolderName }}</div>
           </el-form-item>
           <el-form-item label="居住地址"
                         prop="address">
-            <!-- <el-input class="wd50" v-model="dataForm.address">
+            <!-- <el-input class="wd50" v-model.trim="dataForm.address">
               </el-input> -->
             <div class="wd50">{{ dataForm.address }}</div>
           </el-form-item>
@@ -267,14 +267,14 @@
             <el-form-item label="房屋状态"
                           prop="houseType">
               <!-- <el-input class="item_width_1"
-                          v-model="dataForm.houseType">
+                          v-model.trim="dataForm.houseType">
                 </el-input> -->
               <div class="wd50">{{ dataForm.houseType }}</div>
             </el-form-item>
             <el-form-item label="居住人数"
                           prop="totalResi">
               <!-- <el-input class="item_width_1"
-                          v-model="dataForm.totalResi">
+                          v-model.trim="dataForm.totalResi">
                 </el-input> -->
               <div class="wd50">{{ dataForm.totalResi }}</div>
             </el-form-item>
diff --git a/src/views/modules/base/community/buildForm.vue b/src/views/modules/base/community/buildForm.vue
index 537ef0a66..4a0bf7746 100644
--- a/src/views/modules/base/community/buildForm.vue
+++ b/src/views/modules/base/community/buildForm.vue
@@ -20,7 +20,7 @@
           <el-input class="u-edit-width-normal"
                     maxlength="10"
                     placeholder="请输入楼栋名称"
-                    v-model="dataForm.buildingName">
+                    v-model.trim="dataForm.buildingName">
           </el-input>
         </el-form-item>
         <el-form-item label="楼栋编码"
@@ -29,7 +29,7 @@
           <el-input class="u-edit-width-normal"
                     maxlength="50"
                     placeholder="请输入楼栋编码"
-                    v-model="dataForm.coding">
+                    v-model.trim="dataForm.coding">
 
           </el-input>
           <el-button style="margin-left: 10px"
@@ -43,7 +43,7 @@
         <el-form-item label="楼栋类型"
                       prop="type"
                       style="display: block">
-          <el-radio-group v-model="buildType">
+          <el-radio-group v-model.trim="buildType">
 
             <el-radio :label="'1'">商品房</el-radio>
             <el-radio :label="'2'">自建房</el-radio>
@@ -55,14 +55,14 @@
                       style="display: block"
                       >
           <el-input-number class="u-edit-width-normal"
-                           v-model="dataForm.sort"
+                           v-model.trim="dataForm.sort"
                            label="排序"></el-input-number>
         </el-form-item> -->
         <el-form-item label="单元数"
                       style="display: block"
                       prop="totalUnitNum">
           <el-input-number class="item_width_4"
-                           v-model="dataForm.totalUnitNum"
+                           v-model.trim="dataForm.totalUnitNum"
                            :min="1"
                            :max="9999"
                            label="单元数"></el-input-number>
@@ -71,7 +71,7 @@
                       style="display: block"
                       prop="totalFloorNum">
           <el-input-number class="item_width_4"
-                           v-model="dataForm.totalFloorNum"
+                           v-model.trim="dataForm.totalFloorNum"
                            :min="0"
                            :max="9999"
                            label="层数"></el-input-number>
@@ -80,7 +80,7 @@
                       style="display: block"
                       prop="totalHouseNum">
           <el-input-number class="item_width_4"
-                           v-model="dataForm.totalHouseNum"
+                           v-model.trim="dataForm.totalHouseNum"
                            :min="0"
                            :max="9999"
                            label="总户数"></el-input-number>
@@ -89,7 +89,7 @@
                       style="display: block"
                       prop="realPerson">
           <el-input-number class="item_width_4"
-                           v-model="dataForm.realPerson"
+                           v-model.trim="dataForm.realPerson"
                            :min="0"
                            :max="9999"
                            label="人口数"></el-input-number>
@@ -99,7 +99,7 @@
                       style="display: block">
           <el-input class="u-edit-width-normal"
                     placeholder="请输入楼长姓名"
-                    v-model="dataForm.buildingLeaderName">
+                    v-model.trim="dataForm.buildingLeaderName">
           </el-input>
         </el-form-item>
 
@@ -109,7 +109,7 @@
           <el-input class="u-edit-width-normal"
                     type='number'
                     placeholder="请输入楼长电话"
-                    v-model="dataForm.buildingLeaderMobile">
+                    v-model.trim="dataForm.buildingLeaderMobile">
           </el-input>
         </el-form-item>
 
@@ -117,7 +117,7 @@
                       prop="longitude"
                       style="display: block">
           <div class="u-edit-width-normal m-edit-map">
-            <el-select v-model="searchValue"
+            <el-select v-model.trim="searchValue"
                        filterable
                        class="u-edit-width-normal m-edit-map-search"
                        remote
@@ -142,7 +142,7 @@
           <!-- <span>{{ dataForm.coordinatePosition }}</span> -->
           <el-input class="u-edit-width-normal"
                     placeholder="请选择楼栋地址"
-                    v-model="dataForm.coordinatePosition" />
+                    v-model.trim="dataForm.coordinatePosition" />
         </el-form-item>
       </el-form>
 
diff --git a/src/views/modules/base/community/buildTable.vue b/src/views/modules/base/community/buildTable.vue
index 73f358637..f6b25837b 100644
--- a/src/views/modules/base/community/buildTable.vue
+++ b/src/views/modules/base/community/buildTable.vue
@@ -219,7 +219,7 @@
               <span v-if="!scope.row.isChange">{{ scope.row.sort }}</span>
               <el-input-number v-else
                                @change="handleChangeSort(scope.row)"
-                               v-model="scope.row.sort"
+                               v-model.trim="scope.row.sort"
                                class="item_width_4"
                                size="small"
                                :min="0"
diff --git a/src/views/modules/base/community/community.vue b/src/views/modules/base/community/community.vue
index 8f521c20c..242571d99 100644
--- a/src/views/modules/base/community/community.vue
+++ b/src/views/modules/base/community/community.vue
@@ -1,29 +1,14 @@
 <template>
   <div class="g-main">
-    <div :style="{ height: rowHeight }"
-         class="div_tree">
-      <el-input placeholder="输入关键字进行过滤"
-                v-model="filterText"
-                @keydown.native.enter="handleChangeSerch()">
+    <div :style="{ height: rowHeight }" class="div_tree">
+      <el-input placeholder="输入关键字进行过滤" v-model.trim="filterText" @keydown.native.enter="handleChangeSerch()">
       </el-input>
-      <el-scrollbar :style="{ height: treeHeight }"
-                    class="scrollar">
-        <el-tree ref="ref_tree"
-                 v-loading="treeLoading"
-                 class="filter_tree"
-                 :data="treeData"
-                 :props="defaultProps"
-                 :highlight-current="true"
-                 node-key="id"
-                 :expand-on-click-node="false"
-                 :filter-node-method="filterNode"
-                 @node-click="handleNodeClick"
-                 lazy
-                 :auto-expand-parent="true"
-                 :default-expanded-keys="autoOpenArr"
-                 :load="lazyLoadTree">
-          <span slot-scope="{ node, data }"
-                class="custom-tree-node">
+      <el-scrollbar :style="{ height: treeHeight }" class="scrollar">
+        <el-tree ref="ref_tree" v-loading="treeLoading" class="filter_tree" :data="treeData" :props="defaultProps"
+          :highlight-current="true" node-key="id" :expand-on-click-node="false" :filter-node-method="filterNode"
+          @node-click="handleNodeClick" lazy :auto-expand-parent="true" :default-expanded-keys="autoOpenArr"
+          :load="lazyLoadTree">
+          <span slot-scope="{ node, data }" class="custom-tree-node">
             <!-- <img
               v-if="showIcons(data)"
               src="@/assets/images/index/abnormal.png"
@@ -42,99 +27,64 @@
               <span style="color: red">{{ data.showNum }}</span>
               <span>{{ ")" }}</span>
             </span> -->
-            <span :id="data.id"
-                  :style="{ color: showIcons(data) ? '#ff4d4f' : '' }">{{ data.showName }}</span>
+            <el-tooltip :content="tooltipTitle" :disabled="isShowTooltip" placement="top" effect="dark">
+              <span class="over-ellipsis" @mouseover="mouseOverNode($event)">
+                {{ node.label }}
+              </span>
+            </el-tooltip>
           </span>
         </el-tree>
       </el-scrollbar>
     </div>
 
     <div class="div_left">
-      <div class="m-search"
-           style="flex-direction: column">
+      <div class="m-search" style="flex-direction: column">
         <section :class="boxHeight ? 'm-form-box-height' : 'm-form-box-height-auto'">
-          <el-form :inline="true"
-                   class="communityHeight"
-                   ref="ref_searchform"
-                   :label-width="'100px'">
-            <el-form-item label="房主姓名"
-                          prop="ownerName">
-              <el-input v-model="ownerName"
-                        class="u-item-width-normal"
-                        size="small"
-                        clearable
-                        placeholder="请输入内容">
+          <el-form :inline="true" class="communityHeight" ref="ref_searchform" :label-width="'100px'">
+            <el-form-item label="房主姓名" prop="ownerName">
+              <el-input v-model.trim="ownerName" class="u-item-width-normal" size="small" clearable placeholder="请输入内容">
               </el-input>
             </el-form-item>
-            <el-form-item label="联系电话"
-                          prop="ownerPhone">
-              <el-input v-model="ownerPhone"
-                        class="u-item-width-normal"
-                        size="small"
-                        clearable
-                        placeholder="请输入联系电话">
+            <el-form-item label="联系电话" prop="ownerPhone">
+              <el-input v-model.trim="ownerPhone" class="u-item-width-normal" size="small" clearable placeholder="请输入联系电话">
               </el-input>
             </el-form-item>
 
-            <el-form-item label="房屋状态"
-                          prop="rentFlag">
-              <el-select class="u-item-width-normal"
-                         v-model="rentFlag"
-                         placeholder="请选择"
-                         size="small"
-                         clearable>
-                <el-option v-for="item in rentList"
-                           :key="item.value"
-                           :label="item.label"
-                           :value="item.value">
+            <el-form-item label="房屋状态" prop="rentFlag">
+              <el-select class="u-item-width-normal" v-model.trim="rentFlag" placeholder="请选择" size="small" clearable>
+                <el-option v-for="item in rentList" :key="item.value" :label="item.label" :value="item.value">
                 </el-option>
               </el-select>
             </el-form-item>
 
-            <el-form-item label="房屋用途"
-                          prop="purpose">
-              <el-select v-model="purpose"
-                         class="u-item-width-normal"
-                         placeholder="请选择"
-                         size="small"
-                         clearable>
-                <el-option v-for="item in purposeArr"
-                           :key="item.dictValue"
-                           :label="item.dictName"
-                           :value="item.dictValue">
+            <el-form-item label="房屋用途" prop="purpose">
+              <el-select v-model.trim="purpose" class="u-item-width-normal" placeholder="请选择" size="small" clearable>
+                <el-option v-for="item in purposeArr" :key="item.dictValue" :label="item.dictName"
+                  :value="item.dictValue">
                 </el-option>
               </el-select>
             </el-form-item>
 
-            <el-form-item label="更新时间"
-                          prop="updateStartDate">
-              <el-date-picker v-model="updateStartDate"
-                              :picker-options="startPickerOptions"
-                              class="u-item-width-daterange"
-                              size="small"
-                              type="datetime"
-                              value-format="yyyy-MM-dd HH:mm:ss"
-                              value="yyyy-MM-dd"
-                              placeholder="开始时间">
+            <el-form-item label="更新时间" prop="updateStartDate">
+              <el-date-picker v-model.trim="updateStartDate" :picker-options="startPickerOptions"
+                class="u-item-width-daterange" size="small" type="datetime" value-format="yyyy-MM-dd HH:mm:ss"
+                value="yyyy-MM-dd" placeholder="开始时间">
               </el-date-picker>
               <span class="u-data-tag">至</span>
-              <el-date-picker v-model="updateEndDate"
-                              :picker-options="endPickerOptions"
-                              class="u-item-width-daterange u-data-tag"
-                              size="small"
-                              type="datetime"
-                              value-format="yyyy-MM-dd HH:mm:ss"
-                              value="yyyy-MM-dd"
-                              placeholder="结束时间">
+              <el-date-picker v-model.trim="updateEndDate" :picker-options="endPickerOptions"
+                class="u-item-width-daterange u-data-tag" size="small" type="datetime"
+                value-format="yyyy-MM-dd HH:mm:ss" value="yyyy-MM-dd" placeholder="结束时间">
               </el-date-picker>
             </el-form-item>
-            <el-form-item label="备注"
-                          prop="remark">
-              <el-input v-model="remark"
-                        class="u-item-width-normal"
-                        size="small"
-                        clearable
-                        placeholder="请输入备注">
+            <el-form-item label="居住人数" prop="resiNumber">
+              <el-select v-model.trim="resiNumber" class="u-item-width-normal" placeholder="请选择" size="small" clearable>
+                <el-option v-for="(item,index) in 7" :key="index" :label="index"
+                  :value="index">
+                </el-option>
+              </el-select>
+            </el-form-item>
+            <el-form-item label="备注" prop="remark">
+              <el-input v-model.trim="remark" class="u-item-width-normal" size="small" clearable placeholder="请输入备注">
               </el-input>
             </el-form-item>
 
@@ -152,7 +102,7 @@
                 <div>
                         <el-input
                         placeholder="请输入"
-                        v-model="searchAgencyTxt"
+                        v-model.trim="searchAgencyTxt"
                         @keyup.enter.native="handleChangeSerchAgency(searchAgencyTxt)"
                         >
                       </el-input>
@@ -224,15 +174,9 @@
           </el-form>
         </section>
         <el-row>
-          <el-col :span="24"
-                  align="right">
-            <el-button style="margin-left: 10px"
-                       size="small"
-                       type="primary"
-                       @click="handleSearch">查询</el-button>
-            <el-button size="small"
-                       class="diy-button--white"
-                       @click="resetSearch">重置</el-button>
+          <el-col :span="24" align="right">
+            <el-button style="margin-left: 10px" size="small" type="primary" @click="handleSearch">查询</el-button>
+            <el-button size="small" class="diy-button--white" @click="resetSearch">重置</el-button>
             <!-- <el-button style="margin: 0 6px 0 10px"
                        size="small"
                        class="div-table-button--blue"
@@ -244,54 +188,24 @@
       </div>
 
       <div class="">
-        <build-table v-if="selTreeObj.level === 'neighborHood' && !showRoomTable"
-                     ref="ref_neighTable"
-                     :staffAgencyId="staffAgencyId"
-                     :showImportBtn="showImportBtn"
-                     :ownerName="ownerName"
-                     :ownerPhone="ownerPhone"
-                     :rentFlag="rentFlag"
-                     :purpose="purpose"
-                     :remark="remark"
-                     :updateStartDate="updateStartDate"
-                     :updateEndDate="updateEndDate"
-                     :searchHeight="searchHeight"
-                     @toNextLevel="toNextLevel"
-                     @refreshTree="refreshTree"></build-table>
-
-        <room-table v-if="showRoomTable || selTreeObj.level === 'building'"
-                    :staffAgencyId="staffAgencyId"
-                    :showImportBtn="showImportBtn"
-                    :ownerName="ownerName"
-                    :ownerPhone="ownerPhone"
-                    :rentFlag="rentFlag"
-                    :purpose="purpose"
-                    :neighborHoodId="neighborHoodId"
-                    :buildingId="buildingId"
-                    :buildingUnitId="buildingUnitId"
-                    :houseId="houseId"
-                    :remark="remark"
-                    :updateStartDate="updateStartDate"
-                    :updateEndDate="updateEndDate"
-                    ref="ref_buildingTable"
-                    @refreshTree="refreshTree"></room-table>
-
-        <community-table v-if="
-            selTreeObj.level !== 'building' &&
-            selTreeObj.level !== 'neighborHood' &&
-            !showRoomTable
-          "
-                         @toNextLevel="toNextLevel"
-                         :staffAgencyId="staffAgencyId"
-                         :ownerName="ownerName"
-                         :ownerPhone="ownerPhone"
-                         :rentFlag="rentFlag"
-                         :purpose="purpose"
-                         :remark="remark"
-                         :updateStartDate="updateStartDate"
-                         :updateEndDate="updateEndDate"
-                         ref="ref_communityTable"
-                         @refreshTree="refreshTree"></community-table>
+        <build-table v-if="selTreeObj.level === 'neighborHood' && !showRoomTable" ref="ref_neighTable"
+          :staffAgencyId="staffAgencyId" :showImportBtn="showImportBtn" :ownerName="ownerName" :ownerPhone="ownerPhone"
+          :rentFlag="rentFlag" :purpose="purpose" :remark="remark" :updateStartDate="updateStartDate"
+          :updateEndDate="updateEndDate" :searchHeight="searchHeight" @toNextLevel="toNextLevel"
+          @refreshTree="refreshTree"></build-table>
+
+        <room-table v-if="showRoomTable || selTreeObj.level === 'building'" :staffAgencyId="staffAgencyId"
+          :showImportBtn="showImportBtn" :ownerName="ownerName" :ownerPhone="ownerPhone" :rentFlag="rentFlag"
+          :purpose="purpose" :neighborHoodId="neighborHoodId" :buildingId="buildingId" :buildingUnitId="buildingUnitId"
+          :houseId="houseId" :remark="remark" :updateStartDate="updateStartDate" :updateEndDate="updateEndDate" :resiNumber="resiNumber"
+          ref="ref_buildingTable" @refreshTree="refreshTree"></room-table>
+
+        <community-table v-if="selTreeObj.level !== 'building' &&
+      selTreeObj.level !== 'neighborHood' &&
+      !showRoomTable
+      " @toNextLevel="toNextLevel" :staffAgencyId="staffAgencyId" :ownerName="ownerName" :ownerPhone="ownerPhone"
+          :rentFlag="rentFlag" :purpose="purpose" :remark="remark" :updateStartDate="updateStartDate"
+          :updateEndDate="updateEndDate" ref="ref_communityTable" @refreshTree="refreshTree"></community-table>
       </div>
     </div>
   </div>
@@ -309,7 +223,7 @@ import nextTick from "dai-js/tools/nextTick";
 import debounce from "lodash/debounce";
 let loading; // 加载动画
 export default {
-  data () {
+  data() {
     let endDisabledDate = (time) => {
       //这个关键属性我们一定要写在data的里面并且return的外面，这是动态改变区间的关键
       let nowData = Date.now();
@@ -399,6 +313,7 @@ export default {
       remark: "",
       updateStartDate: "",
       updateEndDate: "",
+      resiNumber:"",
       showRoomTable: false,
       selObj: {},
       purposeArr: [
@@ -432,6 +347,9 @@ export default {
       bDisabled: false,
 
       treeIsOk: true,//树点击是否加载完成
+
+      isShowTooltip: false,
+      tooltipTitle: null,
     };
   },
   components: {
@@ -440,9 +358,8 @@ export default {
     buildTable,
     roomTable,
   },
-  async mounted () {
+  async mounted() {
     this.searchHeight = this.$refs.ref_searchform.offsetHeight;
-
     this.treeLoading = true;
 
     await this.loadOrgData();
@@ -458,20 +375,33 @@ export default {
       });
     }
     this.treeLoading = false;
+    if (this.$route.query.param1 === 'zizhuM') {
+        this.rentFlag = '0';
+        this.handleSearch()
+      } else if (this.$route.query.param1 === 'chuzuM') {
+        this.rentFlag = '1';
+        this.handleSearch()
+      } else if (this.$route.query.param1 === 'xianzhiM') {
+        this.rentFlag = '2';
+        this.handleSearch()
+      } else if (this.$route.query.param1 === 'zongshu') {
+        this.rentFlag = '';
+        this.handleSearch()
+      }
   },
   computed: {
-    rowHeight () {
+    rowHeight() {
       return this.$store.state.inIframe
         ? this.clientHeight - 140 + this.iframeHeight + "px"
         : this.clientHeight - 140 + "px";
     },
-    treeHeight () {
+    treeHeight() {
       return this.$store.state.inIframe
         ? this.clientHeight - 245 + this.iframeHeight + "px"
         : this.clientHeight - 245 + "px";
     },
     ...mapGetters(["clientHeight", "iframeHeight"]),
-    showIcons () {
+    showIcons() {
       return function (data) {
         if (data.level == "building") {
           let arr = data.showNum.split("/");
@@ -489,10 +419,37 @@ export default {
     // filterText (val) {
     //   this.$refs.ref_tree.filter(val);
     // },
-    updateStartDate () { }
+    '$route.query.param1': function (newVal, oldVal) {
+      if (this.$route.query.param1 === 'zizhuM') {
+        this.rentFlag = '0';
+        this.handleSearch()
+      } else if (this.$route.query.param1 === 'chuzuM') {
+        this.rentFlag = '1';
+        this.handleSearch()
+      } else if (this.$route.query.param1 === 'xianzhiM') {
+        this.rentFlag = '2';
+        this.handleSearch()
+      } else if (this.$route.query.param1 === 'zongshu') {
+        this.rentFlag = '';
+        this.handleSearch()
+        // this.getValiheList()
+      }
+    },
+    updateStartDate() { }
   },
   methods: {
-    handleChangeV (val) {
+    mouseOverNode(event) {
+      var target = event.target;
+      let textLength = target.clientWidth;
+      let containerLength = target.scrollWidth;
+      if (textLength < containerLength) {
+        this.tooltipTitle = event.target.innerText;
+        this.isShowTooltip = false;
+      } else {
+        this.isShowTooltip = true;
+      }
+    },
+    handleChangeV(val) {
       this.buildingId = "";
       this.buildingUnitId = "";
       this.houseId = "";
@@ -501,17 +458,17 @@ export default {
       // this.getHouseList();
     },
 
-    handleChangeB (val) {
+    handleChangeB(val) {
       this.buildingUnitId = "";
       this.houseId = "";
       this.getUniList();
       // this.getHouseList();
     },
-    handleChangeD () {
+    handleChangeD() {
       this.houseId = "";
       this.getHouseList();
     },
-    async lazyLoadTree (node, resolve) {
+    async lazyLoadTree(node, resolve) {
 
       const url = `/actual/base/communityBuilding/tree/nextTreeNode?id=${node.data.id}&level=${node.data.level}`;
       const { data, code, msg } = await requestGet(url);
@@ -527,7 +484,7 @@ export default {
       }
       // }
     },
-    async getValiheList () {
+    async getValiheList() {
       const { user } = this.$store.state;
       if (!this.selGridId) {
         this.selAgencyId = this.selAgencyId ? this.selAgencyId : user.agencyId;
@@ -540,12 +497,9 @@ export default {
         agencyId: this.selAgencyId,
         isPage: false,
       };
-
       const { data, code, msg } = await requestPost(url, params);
-
       if (code === 0) {
         this.optionsV = data;
-
         this.neighborHoodId = "";
         this.buildingId = "";
         this.buildingUnitId = "";
@@ -554,7 +508,7 @@ export default {
         this.$message.error(msg);
       }
     },
-    async getBuildList () {
+    async getBuildList() {
       const url = "/actual/base/communityBuilding/buildingoption";
       let params = {
         quartersId: this.neighborHoodId,
@@ -571,7 +525,7 @@ export default {
       }
     },
     //回车搜索组织
-    async handleChangeSerch () {
+    async handleChangeSerch() {
       this.startLoading();
       this.$refs.ref_tree.$data.store.lazy = !this.filterText;
       if (this.filterText.length > 0 && this.filterText != "") {
@@ -597,7 +551,7 @@ export default {
       }
       this.endLoading();
     },
-    startLoading () {
+    startLoading() {
       loading = Loading.service({
         lock: true, // 是否锁定
         text: "正在加载……", // 加载中需要显示的文字
@@ -605,13 +559,13 @@ export default {
       });
     },
     // 结束加载动画
-    endLoading () {
+    endLoading() {
       // clearTimeout(timer);
       if (loading) {
         loading.close();
       }
     },
-    async getUniList () {
+    async getUniList() {
       const url = "/actual/base/communityBuildingUnit/unitoption";
       // const url = "http://yapi.elinkservice.cn/mock/245/epmetuser/epidemicPrevention/page"
       let params = {
@@ -628,7 +582,7 @@ export default {
         this.$message.error(msg);
       }
     },
-    getHouseList () {
+    getHouseList() {
       let params = {
         buildingId: this.buildingId,
         unitId: this.buildingUnitId,
@@ -648,7 +602,7 @@ export default {
         });
     },
 
-    handleSearch () {
+    handleSearch() {
       console.log(this.selTreeObj)
       this.showRoomTable = true;
       this.$nextTick(() => {
@@ -658,7 +612,7 @@ export default {
     },
 
     //重置搜索条件
-    resetSearch () {
+    resetSearch() {
       this.ownerName = "";
       this.ownerPhone = "";
       this.rentFlag = "";
@@ -670,7 +624,7 @@ export default {
       this.buildingId = "";
       this.buildingUnitId = "";
       this.houseId = "";
-
+      this.resiNumber ="";
       this.pageSize = 10;
       this.pageNo = 1;
 
@@ -679,7 +633,7 @@ export default {
       });
     },
 
-    async loadOpenNode () {
+    async loadOpenNode() {
       const url = "/gov/org/building/tree-ids";
       let params = {};
 
@@ -691,7 +645,7 @@ export default {
         this.$message.error(msg);
       }
     },
-    async loadTree (isRefresh) {
+    async loadTree(isRefresh) {
       const url = "/actual/base/communityBuilding/tree/initTree";
       const { data, code, msg } = await requestGet(url);
       if (code === 0) {
@@ -715,7 +669,7 @@ export default {
       }
     },
 
-    handleTreeData (treeData) {
+    handleTreeData(treeData) {
       for (let i in treeData) {
         treeData[i].showIcon = false;
         if (treeData[i].level === "building") {
@@ -735,7 +689,7 @@ export default {
     },
 
     //加载组织数据
-    async loadOrgData () {
+    async loadOrgData() {
       const url = "/gov/org/agency/maporg";
       // const url = "http://yapi.elinkservice.cn/mock/245/gov/org/agency/maporg"
       let params = {};
@@ -752,13 +706,15 @@ export default {
       }
     },
 
-    async handleNodeClick (obj) {
+    async handleNodeClick(obj) {
+
       if (!this.treeIsOk) {
         setTimeout(() => {
           this.handleNodeClick(obj);
         }, 200);
         return false
       }
+    
       this.treeIsOk = false
       this.ownerName = "";
       this.ownerPhone = "";
@@ -774,7 +730,6 @@ export default {
       this.vDisabled = false;
       this.bDisabled = false;
       console.log(obj);
-
       if (obj.level === "building") {
         //点击楼栋 
 
@@ -819,7 +774,7 @@ export default {
     },
 
     //添加小区结束
-    async refreshTree () {
+    async refreshTree() {
       this.treeLoading = true;
       await this.loadTree(this.selTreeObj.id);
       this.$nextTick(() => {
@@ -830,7 +785,7 @@ export default {
     },
 
     //进入下一级
-    async toNextLevel (row, level) {
+    async toNextLevel(row, level) {
 
       this.autoOpenArr = [];
 
@@ -891,7 +846,7 @@ export default {
     },
 
     //解析树数据
-    getTreeObj (obj) {
+    getTreeObj(obj) {
       if (!obj.latitude) {
         obj.latitude = this.centerPoint[0];
       }
@@ -903,13 +858,13 @@ export default {
 
     },
 
-    filterNode (value, data) {
+    filterNode(value, data) {
       if (!value) return true;
       return data.label.indexOf(value) !== -1;
     },
 
     // 开启加载动画
-    startLoading () {
+    startLoading() {
       loading = Loading.service({
         lock: true, // 是否锁定
         text: "正在加载……", // 加载中需要显示的文字
@@ -917,7 +872,7 @@ export default {
       });
     },
     // 结束加载动画
-    endLoading () {
+    endLoading() {
       // clearTimeout(timer);
       if (loading) {
         loading.close();
@@ -936,23 +891,24 @@ export default {
 .m-search ::v-deep .el-row {
   margin-right: 0;
 }
+
 .g-main {
   display: flex;
 }
+
 .scrollar {
   margin-top: 30px;
-  /deep/
-    .el-tree--highlight-current
-    .el-tree-node.is-current
-    > .el-tree-node__content {
+
+  /deep/ .el-tree--highlight-current .el-tree-node.is-current>.el-tree-node__content {
     background: #e6f0ff;
     border-radius: 2px;
   }
 
-  /deep/ .el-tree-node:focus > .el-tree-node__content {
+  /deep/ .el-tree-node:focus>.el-tree-node__content {
     color: #0056d6;
     // background-color: #e6f0ff;
   }
+
   // /deep/ .el-tree-node__expand-icon {
   //   color: #0043c8;
   //   border: 1px solid #e1ecff;
@@ -1006,26 +962,47 @@ export default {
 
 .div_tree {
   margin: 7px 8px 7px 7px;
-  width: 30%;
-  max-width: 304px;
-  min-width: 240px;
+  width: 200px;
+  padding: 24px 15px;
+  background: #ffffff;
+  box-shadow: 0px 6px 16px 0px rgba(0, 0, 0, 0.08),
+    0px 3px 6px -4px rgba(0, 0, 0, 0.12);
+  // border-radius: 5px;
+  overflow-y: hidden;
+
   /deep/ .el-scrollbar__wrap {
     overflow-x: hidden !important;
   }
 
+  /deep/ .el-scrollbar__bar {
+    right: -2px;
+  }
+
   //搜索输入框样式
   /deep/ .el-input--medium .el-input__inner {
     height: 32px;
     background: rgba(0, 0, 0, 0.05);
     border-radius: 4px;
   }
-  flex: 0 0 280px;
-  background: #ffffff;
-  box-shadow: 0px 6px 16px 0px rgba(0, 0, 0, 0.08),
-    0px 3px 6px -4px rgba(0, 0, 0, 0.12);
-  // border-radius: 5px;
-  padding: 24px 15px;
-  overflow-y: hidden;
+
+}
+
+.custom-tree-node {
+  flex: 1;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  font-size: 14px;
+  overflow: hidden;
+}
+
+.over-ellipsis {
+  display: block;
+  width: 140PX;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  -webkit-line-clamp: 1;
 }
 
 .filter_tree {
@@ -1036,8 +1013,9 @@ export default {
 
 .div_left {
   // flex: 1;
-  width: calc(100% - 300px);
+  width: calc(100% - 200px);
 }
+
 ::v-deep .el-dialog__body {
   padding: 0;
 }
diff --git a/src/views/modules/base/community/communityExportInfo.vue b/src/views/modules/base/community/communityExportInfo.vue
index 580ebb354..8b949ed33 100644
--- a/src/views/modules/base/community/communityExportInfo.vue
+++ b/src/views/modules/base/community/communityExportInfo.vue
@@ -1,12 +1,12 @@
 <template>
   <div v-if="list.length > 0"
        class="diy-container">
-    <el-tabs v-model="activeName">
+    <el-tabs v-model.trim="activeName">
       <el-tab-pane label="自定义模板"
                    name="first">
         <div class="diy-wr">
           <div class="left">
-            <el-tabs v-model="leftActive"
+            <el-tabs v-model.trim="leftActive"
                      tab-position="left"
                      class="left-h"
                      @tab-click="handleTabsClick">
@@ -30,7 +30,7 @@
                          @click="handlePreview('')">预览</el-button>
             </div>
             <div class="h80 scroll-h">
-              <el-collapse v-model="activeCollapse"
+              <el-collapse v-model.trim="activeCollapse"
                            id="collapsWr">
                 <el-collapse-item v-for="item in rightList"
                                   :key="item.id"
@@ -100,14 +100,14 @@
       <div class="left">
         <div class="flex-div">
           <div>模板名称：</div>
-          <el-input v-model="form.name"
+          <el-input v-model.trim="form.name"
                     maxlength="20"
                     class="wd200 mr10" />
           <div>自定义表头：</div>
-          <el-input v-model="form.title"
+          <el-input v-model.trim="form.title"
                     maxlength="20"
                     class="wd200 mr10" />
-          <el-checkbox v-model="form.isSaveTemp">保存为常用模板</el-checkbox>
+          <el-checkbox v-model.trim="form.isSaveTemp">保存为常用模板</el-checkbox>
         </div>
       </div>
       <el-button class="diy-button--delete"
diff --git a/src/views/modules/base/community/communityForm.vue b/src/views/modules/base/community/communityForm.vue
index 71ece28b0..ed6b8d93c 100644
--- a/src/views/modules/base/community/communityForm.vue
+++ b/src/views/modules/base/community/communityForm.vue
@@ -9,18 +9,18 @@
                         <span>{{ dataForm.agencyName + '-' + dataForm.gridName }}</span>
                     </el-form-item>
                     <el-form-item v-if="formType === 'add'" label="所属组织" prop="gridId" style="display: block">
-                        <el-cascader ref="ref_cascader_agency" class="u-edit-width-normal" v-model="dataForm.gridId"
+                        <el-cascader ref="ref_cascader_agency" class="u-edit-width-normal" v-model.trim="dataForm.gridId"
                             @change="handleChangeAngency" :props="props" clearable />
 
                     </el-form-item>
 
                     <el-form-item label="小区名称" prop="neighborHoodName" style="display: block">
                         <el-input class="u-edit-width-normal" maxlength="50" show-word-limit placeholder="请输入小区名称"
-                            v-model="dataForm.neighborHoodName">
+                            v-model.trim="dataForm.neighborHoodName">
                         </el-input>
                     </el-form-item>
                     <el-form-item label="居民区类型" prop="quartersType" style="display: block">
-                        <el-radio-group v-model="quartersType">
+                        <el-radio-group v-model.trim="quartersType">
 
                             <el-radio :label="'0'">小区</el-radio>
                             <el-radio :label="'1'">片区</el-radio>
@@ -29,7 +29,7 @@
 
                     <el-form-item label="小区编码" prop="coding" style="display: block">
                         <el-input class="u-edit-width-normal" maxlength="50" placeholder="请输入小区编码"
-                            v-model="dataForm.coding">
+                            v-model.trim="dataForm.coding">
 
                         </el-input>
                         <el-button style="margin-left: 10px" type="text" class="div-table-button--blue"
@@ -54,7 +54,7 @@
                target="_blank">下载</a>
           </div> -->
                     <el-form-item label="关联物业" prop="propertyId" style="display: block">
-                        <el-select class="u-edit-width-normal" v-model="propertyId" placeholder="请选择" filterable clearable>
+                        <el-select class="u-edit-width-normal" v-model.trim="propertyId" placeholder="请选择" filterable clearable>
                             <el-option v-for="item in propertyList" :key="item.propertyId" :label="item.propertyName"
                                 :value="item.propertyId">
                             </el-option>
@@ -64,13 +64,13 @@
 
                     </el-form-item>
                     <el-form-item label="实有楼栋" style="display: block" prop="realBuilding">
-                        <el-input-number class="u-edit-width-normal" v-model="dataForm.realBuilding" :min="0" :max="9999"
+                        <el-input-number class="u-edit-width-normal" v-model.trim="dataForm.realBuilding" :min="0" :max="9999"
                             label="总户数"></el-input-number>
                     </el-form-item>
 
                     <el-form-item label="地图位置" prop="longitude" style="display: block">
                         <div class="u-edit-width-normal m-edit-map">
-                            <el-select v-model="searchValue" filterable class="u-edit-width-normal m-edit-map-search" remote
+                            <el-select v-model.trim="searchValue" filterable class="u-edit-width-normal m-edit-map-search" remote
                                 :reserve-keyword="true" placeholder="请输入关键词" :remote-method="remoteMethod"
                                 :loading="loading">
                                 <el-option v-for="(item, index) in searchOptions" @click.native="handleClickKey(index)"
@@ -83,13 +83,13 @@
 
                     <el-form-item label="详细地址" prop="address" style="display: block">
                         <el-input class="u-edit-width-normal" maxlength="50" show-word-limit placeholder="请输入详细地址"
-                            v-model="dataForm.address">
+                            v-model.trim="dataForm.address">
                         </el-input>
                     </el-form-item>
 
                     <el-form-item label="备注" prop="remark" style="display: block">
                         <el-input class="u-edit-width-normal" type="textarea" maxlength="500" show-word-limit :rows="3"
-                            placeholder="请输入备注，不超过500字" v-model="dataForm.remark"></el-input>
+                            placeholder="请输入备注，不超过500字" v-model.trim="dataForm.remark"></el-input>
                     </el-form-item>
                 </el-form>
             </div>
@@ -99,7 +99,7 @@
                     class="g-edit-form">
                     <el-form-item label="物业名称" prop="name" style="display: block">
                         <el-input class="u-edit-width-normal" maxlength="10" placeholder="请输入小区名称"
-                            v-model="propertyForm.name">
+                            v-model.trim="propertyForm.name">
                         </el-input>
                     </el-form-item>
                 </el-form>
diff --git a/src/views/modules/base/community/roomForm.vue b/src/views/modules/base/community/roomForm.vue
index afa70ad8e..521111e1e 100644
--- a/src/views/modules/base/community/roomForm.vue
+++ b/src/views/modules/base/community/roomForm.vue
@@ -18,7 +18,7 @@
                       prop="buildingUnitId"
                       style="display: block">
           <el-select class="u-edit-width-normal"
-                     v-model="dataForm.buildingUnitId"
+                     v-model.trim="dataForm.buildingUnitId"
                      placeholder="请选择"
                      clearable>
             <el-option v-for="item in unitList"
@@ -34,7 +34,7 @@
                       style="display: block">
           <el-input class="u-edit-width-normal"
                     placeholder="请输入门牌号"
-                    v-model="dataForm.doorName">
+                    v-model.trim="dataForm.doorName">
           </el-input>
         </el-form-item>
         <el-form-item label="房屋编码"
@@ -43,7 +43,7 @@
           <el-input class="u-edit-width-normal"
                     maxlength="50"
                     placeholder="请输入房屋编码"
-                    v-model="dataForm.coding">
+                    v-model.trim="dataForm.coding">
 
           </el-input>
           <el-button style="margin-left: 10px"
@@ -60,7 +60,7 @@
                       style="display: block">
           <el-input class="u-edit-width-normal"
                     maxlength="30"
-                    v-model="dataForm.houseCode">
+                    v-model.trim="dataForm.houseCode">
           </el-input>
         </el-form-item> -->
 
@@ -94,7 +94,7 @@
                       prop="realPerson"
                       >
           <el-input-number class="item_width_4"
-                           v-model="dataForm.realPerson"
+                           v-model.trim="dataForm.realPerson"
                            :min="0"
                            :max="9999"
                            label="居住人数"></el-input-number>
@@ -102,7 +102,7 @@
         <el-form-item label="房屋类型"
                       prop="houseType"
                       style="display: block">
-          <el-radio-group v-model="houseType">
+          <el-radio-group v-model.trim="houseType">
 
             <el-radio :label="'1'">楼房</el-radio>
             <el-radio :label="'2'">平房</el-radio>
@@ -114,7 +114,7 @@
                       prop="purpose"
                       style="display: block"
                       class="u-edit-width-radiolong">
-          <el-radio-group v-model="purpose">
+          <el-radio-group v-model.trim="purpose">
 
             <el-radio :label="'1'">住宅</el-radio>
             <el-radio :label="'2'">商业</el-radio>
@@ -129,7 +129,7 @@
         <el-form-item label="房屋状态"
                       prop="rentFlag"
                       style="display: block">
-          <el-radio-group v-model="rentFlag">
+          <el-radio-group v-model.trim="rentFlag">
 
             <el-radio :label="1">出租</el-radio>
             <el-radio :label="2">闲置</el-radio>
@@ -141,7 +141,7 @@
         <el-form-item label="家庭标签"
                       prop="rentFlag"
                       style="display: block">
-          <el-checkbox-group v-model="dataForm.familyTags"
+          <el-checkbox-group v-model.trim="dataForm.familyTags"
                              @change="changeFamily">
             <el-checkbox v-for="item in dicts.family_tag"
                          :label="item.value"
@@ -155,7 +155,7 @@
           <el-input class="u-edit-width-normal"
                     maxlength="30"
                     placeholder="请输入房主姓名"
-                    v-model="dataForm.ownerName">
+                    v-model.trim="dataForm.ownerName">
           </el-input>
         </el-form-item>
         <el-form-item label="联系电话"
@@ -164,7 +164,7 @@
           <el-input class="u-edit-width-normal"
                     type='number'
                     placeholder="请输入联系电话"
-                    v-model="dataForm.ownerPhone">
+                    v-model.trim="dataForm.ownerPhone">
           </el-input>
         </el-form-item>
         <el-form-item label="房主证件号"
@@ -172,7 +172,7 @@
                       style="display: block">
           <el-input class="u-edit-width-normal"
                     placeholder="请输入房主证件号"
-                    v-model="dataForm.ownerIdCard">
+                    v-model.trim="dataForm.ownerIdCard">
           </el-input>
         </el-form-item>
         <el-form-item label="备注"
@@ -181,7 +181,7 @@
           <el-input class="u-edit-width-normal"
                     maxlength="30"
                     placeholder="请输入备注"
-                    v-model="dataForm.remark">
+                    v-model.trim="dataForm.remark">
           </el-input>
         </el-form-item>
       </el-form>
diff --git a/src/views/modules/base/community/roomTable.vue b/src/views/modules/base/community/roomTable.vue
index 26cb23de9..513e40df4 100644
--- a/src/views/modules/base/community/roomTable.vue
+++ b/src/views/modules/base/community/roomTable.vue
@@ -3,130 +3,74 @@
     <div class="u-table-btn2">
       <div class="u-table-btn2-left">
         <!--    v-show="btnAuths.ic_house_add" -->
-        <el-button v-if="agencyObj.level === 'building' || source !== 'search'"
-                   class="diy-button--blue"
-                   icon="el-icon-plus"
-                   size="small"
-                   :disabled="addDisabled"
-                   @click="handleAdd">新增房屋</el-button>
+        <el-button v-if="agencyObj.level === 'building' || source !== 'search'" class="diy-button--blue"
+          icon="el-icon-plus" size="small" :disabled="addDisabled" @click="handleAdd">新增房屋</el-button>
 
-        <div class="u-btn-upload"
-             v-if="showImportBtn">
+        <div class="u-btn-upload" v-if="showImportBtn">
 
-          <el-popover popper-class="btn-popper"
-                      placement="bottom"
-                      width="20"
-                      trigger="hover">
+          <el-popover popper-class="btn-popper" placement="bottom" width="20" trigger="hover">
 
             <div class="table-more-btn">
               <!--  v-if="btnAuths.ic_house_import" -->
-              <el-upload ref="upload"
-                         :multiple="false"
-                         style="text-align: center"
-                         :show-file-list="false"
-                         :before-upload="beforeUpload"
-                         action=""
-                         accept=".xls,.xlsx"
-                         :limit="1"
-                         :on-exceed="handleExceed"
-                         :http-request="uploadFile">
-                <el-button style=""
-                           size="small"
-                           type="text"
-                           class="diy-button--other">导入房屋数据</el-button>
+              <el-upload ref="upload" :multiple="false" style="text-align: center" :show-file-list="false"
+                :before-upload="beforeUpload" action="" accept=".xls,.xlsx" :limit="1" :on-exceed="handleExceed"
+                :http-request="uploadFile">
+                <el-button style="" size="small" type="text" class="diy-button--other">导入房屋数据</el-button>
               </el-upload>
             </div>
 
-            <el-button size="small"
-                       style="float:right"
-                       class="diy-button--white"
-                       slot="reference">导入<i class="el-icon-arrow-down el-icon--right"></i></el-button>
+            <el-button size="small" style="float:right" class="diy-button--white" slot="reference">导入<i
+                class="el-icon-arrow-down el-icon--right"></i></el-button>
           </el-popover>
 
         </div>
         <!-- v-if="btnAuths.ic_house_export" -->
-        <el-button style="float: left; margin-left: 10px"
-                   class="diy-button--white"
-                   size="small"
-                   @click="handleExport">导出</el-button>
+        <el-button style="float: left; margin-left: 10px" class="diy-button--white" size="small"
+          @click="handleExport">导出</el-button>
         <!-- v-if="btnAuths.ic_house_batch_del" -->
-        <el-button style="float: left; margin-left: 10px"
-                   class="diy-button--white"
-                   size="small"
-                   @click="deleteBatch">批量删除</el-button>
+        <el-button style="float: left; margin-left: 10px" class="diy-button--white" size="small"
+          @click="deleteBatch">批量删除</el-button>
 
       </div>
 
       <div>
-        <el-popover popper-class="btn-popper"
-                    placement="bottom"
-                    style="margin-left: 10px"
-                    width="20"
-                    trigger="hover">
+        <el-popover popper-class="btn-popper" placement="bottom" style="margin-left: 10px" width="20" trigger="hover">
           <div class="table-more-btn">
             <!-- v-if="btnAuths.ic_house_import" -->
-            <el-button :headers="$getElUploadHeaders()"
-                       class="diy-button--other"
-                       size="small"
-                       type="text"
-                       @click="handleExportModule('community')">下载小区模板</el-button>
+            <el-button :headers="$getElUploadHeaders()" class="diy-button--other" size="small" type="text"
+              @click="handleExportModule('community')">下载小区模板</el-button>
           </div>
           <div class="table-more-btn">
             <!-- v-if="btnAuths.ic_house_import" -->
-            <el-button :headers="$getElUploadHeaders()"
-                       class="diy-button--other"
-                       size="small"
-                       type="text"
-                       @click="handleExportModule('building')">下载楼栋模板</el-button>
+            <el-button :headers="$getElUploadHeaders()" class="diy-button--other" size="small" type="text"
+              @click="handleExportModule('building')">下载楼栋模板</el-button>
           </div>
           <div class="table-more-btn">
             <!-- v-if="btnAuths.ic_house_import" -->
-            <el-button :headers="$getElUploadHeaders()"
-                       class="diy-button--other"
-                       size="small"
-                       type="text"
-                       @click="handleExportModule('room')">下载房屋模板</el-button>
+            <el-button :headers="$getElUploadHeaders()" class="diy-button--other" size="small" type="text"
+              @click="handleExportModule('room')">下载房屋模板</el-button>
           </div>
           <!-- v-if="btnAuths.ic_house_export_yhyd" -->
           <div class="table-more-btn">
-            <el-button style=""
-                       class="diy-button--other"
-                       size="small"
-                       type="text"
-                       :disabled="yihuyidangDisabled"
-                       @click="handleExportYihuyidang()">导出一户一档</el-button>
+            <el-button style="" class="diy-button--other" size="small" type="text" :disabled="yihuyidangDisabled"
+              @click="handleExportYihuyidang()">导出一户一档</el-button>
 
           </div>
           <!-- btnAuths.ic_house_smart_import && -->
-          <div v-if="displayedBaobiaoBtn"
-               class="table-more-btn">
-            <el-button size="small"
-                       class="diy-button--other"
-                       type="text"
-                       @click="reportForm">智能填报</el-button>
+          <div v-if="displayedBaobiaoBtn" class="table-more-btn">
+            <el-button size="small" class="diy-button--other" type="text" @click="reportForm">智能填报</el-button>
           </div>
 
-          <el-button size="small"
-                     style="float:right"
-                     class="diy-button--white"
-                     slot="reference">更多<i class="el-icon-arrow-down el-icon--right"></i></el-button>
+          <el-button size="small" style="float:right" class="diy-button--white" slot="reference">更多<i
+              class="el-icon-arrow-down el-icon--right"></i></el-button>
         </el-popover>
       </div>
     </div>
 
     <div class="m-table-item">
-      <el-table ref="ref_table"
-                :data="tableData"
-                v-loading="tableLoading"
-                @sort-change="handleSortOrderChange"
-                border
-                :height="tableHeight"
-                style="width: 100%"
-                @select-all="selectAll"
-                @selection-change="selectionChange">
-        <el-table-column type="selection"
-                         :selectable="checkSelect"
-                         width="55">
+      <el-table ref="ref_table" :data="tableData" v-loading="tableLoading" @sort-change="handleSortOrderChange" border
+        :height="tableHeight" style="width: 100%" @select-all="selectAll" @selection-change="selectionChange">
+        <el-table-column type="selection" :selectable="checkSelect" width="55">
         </el-table-column>
         <!-- <el-table-column fixed="left"
                          width="70"
@@ -137,183 +81,86 @@
                          :index="indexMethod">
         </el-table-column> -->
 
-        <el-table-column prop="houseNameShow"
-                         header-align="left"
-                         align="left"
-                         label="房屋名称"
-                         fixed="left"
-                         min-width="160">
+        <el-table-column prop="houseNameShow" header-align="left" align="left" label="房屋名称" fixed="left"
+          min-width="160">
         </el-table-column>
-        <el-table-column prop="neighborHoodName"
-                         label="所属小区"
-                         header-align="left"
-                         align="left"
-                         min-width="150">
+        <el-table-column prop="neighborHoodName" label="所属小区" header-align="left" align="left" min-width="150">
         </el-table-column>
-        <el-table-column prop="buildingName"
-                         label="所属楼栋"
-                         header-align="left"
-                         align="left"
-                         width="90">
+        <el-table-column prop="buildingName" label="所属楼栋" header-align="left" align="left" width="90">
         </el-table-column>
-        <el-table-column prop="unitNum"
-                         label="单元号"
-                         header-align="left"
-                         align="left"
-                         width="80">
+        <el-table-column prop="unitNum" label="单元号" header-align="left" align="left" width="80">
         </el-table-column>
-        <el-table-column prop="doorName"
-                         label="门牌号"
-                         header-align="left"
-                         align="left"
-                         width="80">
+        <el-table-column prop="doorName" label="门牌号" header-align="left" align="left" width="80">
         </el-table-column>
-        <el-table-column prop="houseType"
-                         label="类型"
-                         header-align="left"
-                         align="left"
-                         width="70">
+        <el-table-column prop="houseType" label="类型" header-align="left" align="left" width="70">
         </el-table-column>
-        <el-table-column prop="purpose"
-                         label="用途"
-                         header-align="left"
-                         align="left"
-                         width="70">
+        <el-table-column prop="purpose" label="用途" header-align="left" align="left" width="70">
         </el-table-column>
-        <el-table-column prop="rentFlag"
-                         label="房屋状态"
-                         header-align="left"
-                         align="left"
-                         width="90">
+        <el-table-column prop="rentFlag" label="房屋状态" header-align="left" align="left" width="90">
         </el-table-column>
-        <el-table-column prop="ownerName"
-                         label="房主姓名"
-                         header-align="left"
-                         align="left"
-                         width="90">
+        <el-table-column prop="ownerName" label="房主姓名" header-align="left" align="left" width="90">
         </el-table-column>
-        <el-table-column prop="ownerPhone"
-                         label="联系方式"
-                         header-align="left"
-                         align="left"
-                         width="110">
+        <el-table-column prop="ownerPhone" label="联系方式" header-align="left" align="left" width="110">
         </el-table-column>
-        <el-table-column prop="ownerIdCard"
-                         label="证件号"
-                         header-align="left"
-                         align="left"
-                         width="170">
+        <el-table-column prop="ownerIdCard" label="证件号" header-align="left" align="left" width="170">
         </el-table-column>
-        <el-table-column prop="remark"
-                         label="备注"
-                         header-align="left"
-                         align="left"
-                         width="170">
+        <el-table-column prop="resiNumber" label="居住人数" header-align="left" align="left" width="100">
+        </el-table-column>
+        <el-table-column prop="remark" label="备注" header-align="left" align="left" width="170">
         </el-table-column>
 
-        <el-table-column prop="sort"
-                         sortable="custom"
-                         min-width="100"
-                         header-align="left"
-                         align="left"
-                         label="排序">
+        <el-table-column prop="sort" sortable="custom" min-width="100" header-align="left" align="left" label="排序">
           <template slot-scope="scope">
             <div @click="handleEditSort(scope.row)">
               <span v-if="!scope.row.isChange">{{ scope.row.sort }}</span>
               <!-- :precision="2" -->
-              <el-input-number v-else
-                               @change="handleChangeSort(scope.row)"
-                               v-model="scope.row.sort"
-                               class="item_width_4"
-                               size="small"
-                               :min="0"
-                               :max="9999"
-                               label="描述文字"></el-input-number>
+              <el-input-number v-else @change="handleChangeSort(scope.row)" v-model.trim="scope.row.sort"
+                class="item_width_4" size="small" :min="0" :max="9999" label="描述文字"></el-input-number>
             </div>
           </template>
         </el-table-column>
-        <el-table-column label="操作"
-                         fixed="right"
-                         width="220"
-                         header-align="center"
-                         align="center"
-                         class="operate">
+        <el-table-column label="操作" fixed="right" width="220" header-align="center" align="center" class="operate">
           <template slot-scope="scope">
             <!-- v-if="btnAuths.ic_house_view" -->
-            <el-button type="text"
-                       class="div-table-button--blue"
-                       size="small"
-                       @click="handleDetail(scope.row)">查看</el-button>
+            <el-button type="text" class="div-table-button--blue" size="small"
+              @click="handleDetail(scope.row)">查看</el-button>
             <!-- btnAuths.ic_house_update && -->
-            <el-button type="text"
-                       class="div-table-button--blue"
-                       size="small"
-                       @click="handleEdit(scope.row)">编辑</el-button>
+            <el-button type="text" class="div-table-button--blue" size="small"
+              @click="handleEdit(scope.row)">编辑</el-button>
             <!-- btnAuths.ic_house_del && -->
-            <el-button type="text"
-                       class="div-table-button--blue"
-                       size="small"
-                       @click="handleDelete(scope.row)">删除</el-button>
+            <el-button type="text" class="div-table-button--blue" size="small"
+              @click="handleDelete(scope.row)">删除</el-button>
           </template>
         </el-table-column>
       </el-table>
       <div>
-        <el-pagination @size-change="handleSizeChange"
-                       @current-change="handleCurrentChange"
-                       :current-page.sync="pageNo"
-                       :page-sizes="[20, 50, 100, 200]"
-                       :page-size="pageSize"
-                       layout="sizes, prev, pager, next, total"
-                       :total="total">
+        <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page.sync="pageNo"
+          :page-sizes="[20, 50, 100, 200]" :page-size="pageSize" layout="sizes, prev, pager, next, total"
+          :total="total">
         </el-pagination>
       </div>
     </div>
 
     <!-- 修改弹出框 -->
-    <el-dialog :visible.sync="formShow"
-               :close-on-click-modal="false"
-               :close-on-press-escape="false"
-               :title="formTitle"
-               width="670px"
-               top="5vh"
-               class="dialog-h"
-               @closed="diaClose">
-      <room-form ref="ref_form"
-                 @dialogCancle="addFormCancle"
-                 @dialogOk="addFormOk"></room-form>
+    <el-dialog :visible.sync="formShow" :close-on-click-modal="false" :close-on-press-escape="false" :title="formTitle"
+      width="670px" top="5vh" class="dialog-h" @closed="diaClose">
+      <room-form ref="ref_form" @dialogCancle="addFormCancle" @dialogOk="addFormOk"></room-form>
     </el-dialog>
 
     <!-- 详情弹出框 -->
-    <el-dialog :visible.sync="detailShow"
-               :close-on-click-modal="false"
-               :close-on-press-escape="false"
-               :title="'查看房屋'"
-               width="820px"
-               top="5vh"
-               class="dialog-h"
-               @closed="detailFormCancle">
+    <el-dialog :visible.sync="detailShow" :close-on-click-modal="false" :close-on-press-escape="false" :title="'查看房屋'"
+      width="820px" top="5vh" class="dialog-h" @closed="detailFormCancle">
       <!-- :view_real_data="btnAuths.ic_house_view_real_data" -->
-      <room-detail ref="ref_form_detail"
-                   @diaDetailClose="detailFormCancle"></room-detail>
+      <room-detail ref="ref_form_detail" @diaDetailClose="detailFormCancle"></room-detail>
     </el-dialog>
-    <el-dialog :visible.sync="diyDialog"
-               :close-on-click-modal="false"
-               :close-on-press-escape="false"
-               width="1150px"
-               title="导出模板"
-               top="5vh"
-               class="dialog-h">
-      <community-export-info v-if="diyDialog"
-                             ref="ref_diy"
-                             :list="exportList"
-                             :search="{
-        formCode: 'community_info',
-        pageNo: pageNo,
-        pageSize: pageSize,
-        conditions:queryConditions
-      }"
-                             :orgId="agencyObj.id"
-                             @close="handleDiyClose"></community-export-info>
+    <el-dialog :visible.sync="diyDialog" :close-on-click-modal="false" :close-on-press-escape="false" width="1150px"
+      title="导出模板" top="5vh" class="dialog-h">
+      <community-export-info v-if="diyDialog" ref="ref_diy" :list="exportList" :search="{
+          formCode: 'community_info',
+          pageNo: pageNo,
+          pageSize: pageSize,
+          conditions: queryConditions
+        }" :orgId="agencyObj.id" @close="handleDiyClose"></community-export-info>
     </el-dialog>
     <baobiao ref="baobiao" />
   </div>
@@ -331,13 +178,13 @@ import util from "@/js/util";
 
 let loading; // 加载动画
 export default {
-  data () {
+  data() {
     return {
       searchHeight: 190,//搜索栏高度
       source: "tree", //来源
       importRoomLoading: false,
       total: 0,
-      pageSize:window.localStorage.getItem('pageSize') || 20,
+      pageSize: window.localStorage.getItem('pageSize') || 20,
       pageNo: 0,
       sortType: "asc", //asc：正，desc：倒
       tableLoading: true,
@@ -401,10 +248,9 @@ export default {
     roomDetail,
     communityExportInfo
   },
-  async mounted () {
+  async mounted() {
     this.updateBtnAuths();
     this.getQueryConditions()
-
     // this.displayedBaobiaoBtn = await this.$refs.baobiao.existsTemplate({
     //   elseParams: {
     //     categoryKeys: ["house_info"],
@@ -413,7 +259,7 @@ export default {
     // });
   },
   computed: {
-    tableHeight () {
+    tableHeight() {
       console.log(this.searchHeight)
       let height = this.searchHeight + 270
       return this.$store.state.inIframe ? this.clientHeight - height + this.iframeHeight : this.clientHeight - height
@@ -424,7 +270,7 @@ export default {
   },
   methods: {
     // 更新按钮权限
-    updateBtnAuths () {
+    updateBtnAuths() {
       let rot = this.$route;
       if (Array.isArray(rot.meta.btns)) {
         rot.meta.btns.forEach((item) => {
@@ -433,7 +279,7 @@ export default {
       }
     },
 
-    reportForm () {
+    reportForm() {
       let paramMap = {
         pageSize: this.pageSize,
         pageNo: this.pageNo,
@@ -461,25 +307,25 @@ export default {
       });
     },
 
-    indexMethod (index) {
+    indexMethod(index) {
       return index + 1;
     },
-    handleSortOrderChange (value) {
+    handleSortOrderChange(value) {
       this.sortType = value.order === "ascending" ? "asc" : "desc";
       this.loadTable();
     },
-    handleSortChange (value) {
+    handleSortChange(value) {
       this.sortType = value.order === "ascending" ? "asc" : "desc";
       this.loadTable();
     },
 
-    handleEditSort (row) {
+    handleEditSort(row) {
       if (!row.isChange) {
         row.isChange = true;
       }
     },
 
-    async handleChangeSort (row, index) {
+    async handleChangeSort(row, index) {
       // row.isChange = false
 
       let params = {
@@ -502,7 +348,7 @@ export default {
       }
     },
 
-    checkSelect (row, index) {
+    checkSelect(row, index) {
       let isChecked = true;
       // if (row.showBtn) {
       //   // 判断里面是否存在某个参数
@@ -513,9 +359,8 @@ export default {
       return isChecked;
     },
 
-    loadTreeFromSearch () { },
-
-    async loadTable (source, treeObj) {
+    loadTreeFromSearch() { },
+    async loadTable(source, treeObj) {
       this.source = source;
       this.tableLoading = true;
       this.addDisabled = true
@@ -528,7 +373,6 @@ export default {
         //来源于查询
         this.agencyObj = treeObj;
       }
-
       if (this.agencyObj.level === "grid") {
         this.agencyLevel = "grid";
       } else if (this.agencyObj.level === "neighborHood") {
@@ -541,10 +385,8 @@ export default {
 
       // if (fromTree) {
       //   this.agencyObj = treeObj
-
       // }
       // 接口在这里
-      console.log(this.buildingId, '1111');
       let params = {
         pageSize: this.pageSize,
         pageNo: this.pageNo,
@@ -562,8 +404,8 @@ export default {
         buildingId: this.buildingId,
         buildingUnitId: this.buildingUnitId,
         houseId: this.houseId,
+        resiNumber:this.resiNumber
       };
-
       const url = "/actual/base/communityHouse/listHouses";
 
       const { data, code, msg } = await requestPost(url, params);
@@ -596,26 +438,30 @@ export default {
       this.tableLoading = false;
     },
 
-    diaClose () {
+    diaClose() {
       this.$refs.ref_form.resetData();
       this.formShow = false;
     },
 
-    handleDetail (row) {
-      this.detailShow = true;
-
-      // const _data = await this.detail(row)
-      this.$nextTick(() => {
-        this.$refs.ref_form_detail.initForm(row, this.agencyObj);
+    handleDetail(row) {
+      this.lookResiId = row.resiId;
+      let { agencyId, gridId, gridName, houseId, houseName } = row
+      this.$store.dispatch('saveDataH', { agencyId, gridId, gridName, houseId, houseName });
+      this.$router.push({ name: 'house-huaxiang' });
+      this.$store.state.contentTabs = this.$store.state.contentTabs.map(item => {
+        if (item.name === "house-huaxiang") {
+          return { ...item, title: name };
+        }
+        return item;
       });
     },
 
-    detailFormCancle () {
+    detailFormCancle() {
       // this.$refs.ref_form_detail.diaDestroy()
       this.detailShow = false;
     },
 
-    handleAdd () {
+    handleAdd() {
       this.formTitle = "新增房屋";
       this.formShow = true;
       this.$nextTick(() => {
@@ -623,7 +469,7 @@ export default {
       });
     },
 
-    handleEdit (row) {
+    handleEdit(row) {
       this.formTitle = "修改房屋";
       this.formShow = true;
       this.$nextTick(() => {
@@ -631,24 +477,24 @@ export default {
       });
     },
 
-    addFormCancle () {
+    addFormCancle() {
       this.formShow = false;
     },
-    addFormOk () {
+    addFormOk() {
       this.formShow = false;
       this.loadTable();
       this.$emit('refreshTree')
     },
 
 
-    selectAll (selection) {
+    selectAll(selection) {
       this.selection = selection;
     },
-    selectionChange (selection) {
+    selectionChange(selection) {
       this.selection = selection;
     },
 
-    async handleDelete (row) {
+    async handleDelete(row) {
       this.$confirm("确认删除?", "提示", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
@@ -670,7 +516,7 @@ export default {
         });
     },
 
-    deleteBatch () {
+    deleteBatch() {
       if (this.selection.length > 0) {
         this.$confirm("确认删除选择的房屋?", "提示", {
           confirmButtonText: "确定",
@@ -700,7 +546,7 @@ export default {
       }
     },
 
-    async deleteRoom (ids, forceDelete) {
+    async deleteRoom(ids, forceDelete) {
       const url = "/actual/base/communityHouse/deleteCommunityInfoByIds";
       let params = {
         forceDelete: forceDelete,
@@ -744,7 +590,7 @@ export default {
 
 
     //导出表格
-    async handleExport () {
+    async handleExport() {
       // let title = this.agencyObj.label;
       // title = title + "—房屋列表";
 
@@ -798,7 +644,7 @@ export default {
       // );
       await this.getExportList();
     },
-    async getExportList (type) {
+    async getExportList(type) {
       const url = "/oper/customize/icformitemgroup/list";
       let params = {
         formCode: "community_info",
@@ -822,7 +668,7 @@ export default {
         this.$message.error(msg);
       }
     },
-    async getQueryConditions () {
+    async getQueryConditions() {
       let params = {
         formCode: "community_info",
         customerId: this.$store.state.user.customerId,
@@ -845,11 +691,11 @@ export default {
         this.$message.error(data.msg);
       }
     },
-    handleDiyClose () {
+    handleDiyClose() {
       this.diyDialog = false;
     },
     // 下载文件
-    download (data, fileName) {
+    download(data, fileName) {
       if (!data) {
         return;
       }
@@ -873,7 +719,7 @@ export default {
       }
     },
 
-    handleExportModule (type) {
+    handleExportModule(type) {
 
       let title = ''
       let url = ""
@@ -906,7 +752,7 @@ export default {
     },
 
     //导出一户一档
-    handleExportYihuyidang () {
+    handleExportYihuyidang() {
       this.yihuyidangDisabled = true;
       let title = this.agencyObj.label;
       title = title + "-一户一档";
@@ -966,7 +812,7 @@ export default {
       );
     },
     // 上传文件之前的钩子
-    beforeUpload (file) {
+    beforeUpload(file) {
       this.files = file;
 
       const isText = file.type === "application/vnd.ms-excel";
@@ -983,11 +829,11 @@ export default {
       }
     },
     // 上传文件个数超过定义的数量
-    handleExceed (files, fileList) {
+    handleExceed(files, fileList) {
       this.$message.warning(`当前限制选择 1 个文件，请删除后继续上传`);
     },
 
-    async uploadFile () {
+    async uploadFile() {
       if (this.fileName == "") {
         this.$message.warning("请选择要上传的文件！");
         return false;
@@ -1041,7 +887,7 @@ export default {
       );
     },
 
-    showMessage (msg) {
+    showMessage(msg) {
       this.$alert(msg, "操作结果", {
         confirmButtonText: "关闭",
         callback: (action) => {
@@ -1051,18 +897,18 @@ export default {
       });
     },
 
-    handleSizeChange (val) {
+    handleSizeChange(val) {
       this.pageSize = val;
       this.pageNo = 1;
       this.loadTable();
     },
-    handleCurrentChange (val) {
+    handleCurrentChange(val) {
       this.pageNo = val;
       this.loadTable();
     },
 
     // 开启加载动画
-    startLoading () {
+    startLoading() {
       loading = Loading.service({
         lock: true, // 是否锁定
         text: "正在加载……", // 加载中需要显示的文字
@@ -1070,7 +916,7 @@ export default {
       });
     },
     // 结束加载动画
-    endLoading () {
+    endLoading() {
       // clearTimeout(timer);
       if (loading) {
         loading.close();
@@ -1078,7 +924,7 @@ export default {
     },
   },
   watch: {
-    selection (val) {
+    selection(val) {
       if (val.length > 0) {
         this.showDeletBtn = true;
       } else {
@@ -1086,7 +932,7 @@ export default {
       }
     },
     '$store.state.sidebarFold': {
-      handler (newVal, oldVal) {
+      handler(newVal, oldVal) {
         if (newVal) {//收起
           this.searchHeight = 155
 
@@ -1153,10 +999,14 @@ export default {
       type: String,
       default: "",
     },
+    resiNumber:{
+      type: Number,
+      default: "",
+    }
   },
 };
 </script>
-<style lang="scss" scoped >
+<style lang="scss" scoped>
 @import "@/assets/scss/modules/visual/communityManage.scss";
 @import "@/assets/scss/modules/management/list-main.scss";
 </style>
diff --git a/src/views/modules/base/diyInfo.vue b/src/views/modules/base/diyInfo.vue
index cce171821..428ab3b71 100644
--- a/src/views/modules/base/diyInfo.vue
+++ b/src/views/modules/base/diyInfo.vue
@@ -1,10 +1,10 @@
 <template>
   <div v-if="list.length > 0" class="diy-container">
-    <el-tabs v-model="activeName">
+    <el-tabs v-model.trim="activeName">
       <el-tab-pane label="自定义模板" name="first">
         <div class="diy-wr">
           <div class="left">
-            <el-tabs v-model="leftActive" tab-position="left" class="left-h" @tab-click="handleTabsClick">
+            <el-tabs v-model.trim="leftActive" tab-position="left" class="left-h" @tab-click="handleTabsClick">
               <el-tab-pane v-for="item in leftList" :key="item.id" :label="item.label" :name="item.id">
                 <div class="pd10 check-boxwr scroll-h">
                   <checkBox v-if="item.queryItemList.length > 0" :ref="'checkbox' + item.id"
@@ -20,7 +20,7 @@
               <el-button plain @click="handlePreview('')">预览</el-button>
             </div>
             <div class="h80 scroll-h">
-              <el-collapse v-model="activeCollapse" id="collapsWr">
+              <el-collapse v-model.trim="activeCollapse" id="collapsWr">
                 <el-collapse-item v-for="item in rightList" :key="item.id"
                 :title="item.label" :name="item.id" class="col-h">
                   <dragItem :ref="'drag' + item.id" :list="item.queryItemList" :id="item.id"
@@ -83,10 +83,10 @@
       <div class="left">
         <div class="flex-div">
           <div>模板名称：</div>
-          <el-input v-model="form.name" maxlength="20" class="wd200 mr10" />
+          <el-input v-model.trim="form.name" maxlength="20" class="wd200 mr10" />
           <div>自定义表头：</div>
-          <el-input v-model="form.title" maxlength="20" class="wd200 mr10" />
-          <el-checkbox v-model="form.isSaveTemp">保存为常用模板</el-checkbox>
+          <el-input v-model.trim="form.title" maxlength="20" class="wd200 mr10" />
+          <el-checkbox v-model.trim="form.isSaveTemp">保存为常用模板</el-checkbox>
         </div>
       </div>
       <el-button class="diy-button--delete" :loading="exportLoading" @click="handleExport">导出</el-button>
diff --git a/src/views/modules/base/grid.vue b/src/views/modules/base/grid.vue
index c3c25998d..e633c5301 100644
--- a/src/views/modules/base/grid.vue
+++ b/src/views/modules/base/grid.vue
@@ -11,7 +11,7 @@
                 <div class="resi-cell-label">所属组织</div>
                 <div class="resi-cell-value"
                      :class="'resi-cell-value-radio'">
-                  <el-select v-model="fmData.agencyId"
+                  <el-select v-model.trim="fmData.agencyId"
                              placeholder="请选择"
                              size="small"
                              clearable
@@ -31,7 +31,7 @@
                 <div class="resi-cell-label">所属组织</div>
                 <div class="resi-cell-value"
                      :class="'resi-cell-value-radio'">
-                  <el-input v-model="fmData.agencyId"
+                  <el-input v-model.trim="fmData.agencyId"
                             class="resi-cell-input"
                             size="small"
                             clearable
diff --git a/src/views/modules/base/huji/chusheng/cpts/edit.vue b/src/views/modules/base/huji/chusheng/cpts/edit.vue
index 6d8710239..2c58c8cdb 100644
--- a/src/views/modules/base/huji/chusheng/cpts/edit.vue
+++ b/src/views/modules/base/huji/chusheng/cpts/edit.vue
@@ -99,14 +99,14 @@
                     class="u-edit-width-normal"
                     placeholder="请输入姓名	"
                     :disabled="formType === 'edit'"
-                    v-model="fmData.name">
+                    v-model.trim="fmData.name">
           </el-input>
           <div>
-            <el-checkbox v-model="fmData.isWelfare"
+            <el-checkbox v-model.trim="fmData.isWelfare"
                          :disabled="formType === 'edit'"
                          true-label="1"
                          false-label="0">享受福利</el-checkbox>
-            <el-checkbox v-model="fmData.isCheck"
+            <el-checkbox v-model.trim="fmData.isCheck"
                          true-label="1"
                          false-label="0"
                          :disabled="formType === 'edit'"
@@ -121,7 +121,7 @@
                     maxlength="30"
                     show-word-limit
                     placeholder="请输入联系电话	"
-                    v-model="fmData.mobile"
+                    v-model.trim="fmData.mobile"
                     :disabled="formType === 'edit'">
           </el-input>
         </el-form-item>
@@ -132,7 +132,7 @@
           <el-input class="u-edit-width-normal"
                     maxlength="30"
                     placeholder="请输入证件号或护照号"
-                    v-model="fmData.idCard"
+                    v-model.trim="fmData.idCard"
                     @blur="handleBlurId"
                     :disabled="formType === 'edit'"></el-input>
         </el-form-item>
@@ -157,7 +157,7 @@
         <el-form-item label="出生日期"
                       prop="birthday"
                       style="display: block">
-          <el-date-picker v-model="fmData.birthday"
+          <el-date-picker v-model.trim="fmData.birthday"
                           type="date"
                           class="u-edit-width-normal"
                           placeholder="出生日期"
@@ -173,7 +173,7 @@
                     maxlength="50"
                     show-word-limit
                     placeholder="请输入出生地"
-                    v-model="fmData.birthplace">
+                    v-model.trim="fmData.birthplace">
           </el-input>
         </el-form-item>
 
@@ -184,7 +184,7 @@
                     maxlength="30"
                     show-word-limit
                     placeholder="请输入出生人父亲姓名"
-                    v-model="fmData.father">
+                    v-model.trim="fmData.father">
           </el-input>
         </el-form-item>
 
@@ -195,14 +195,14 @@
                     maxlength="30"
                     show-word-limit
                     placeholder="请输入出生人母亲姓名"
-                    v-model="fmData.mother">
+                    v-model.trim="fmData.mother">
           </el-input>
         </el-form-item>
 
         <el-form-item label="胎次"
                       prop="count"
                       style="display: block">
-          <el-input-number v-model="fmData.count"
+          <el-input-number v-model.trim="fmData.count"
                            class="u-edit-width-normal"
                            :min="1"
                            :max="50"
@@ -212,7 +212,7 @@
         <el-form-item label="申报户口日期"
                       prop="reportDate"
                       style="display: block">
-          <el-date-picker v-model="fmData.reportDate"
+          <el-date-picker v-model.trim="fmData.reportDate"
                           class="u-edit-width-normal"
                           placeholder="申报户口日期"
                           value-format="yyyy-MM-dd">
@@ -227,7 +227,7 @@
                     show-word-limit
                     placeholder="请输入户主姓名"
                     :disabled="fmData.alreadyHaveMaster"
-                    v-model="fmData.householderName">
+                    v-model.trim="fmData.householderName">
           </el-input>
         </el-form-item>
 
@@ -257,7 +257,7 @@
                     show-word-limit
                     :rows="3"
                     placeholder="请输入备注，不超过500字"
-                    v-model="fmData.remark"></el-input>
+                    v-model.trim="fmData.remark"></el-input>
         </el-form-item>
       </el-form>
     </div>
diff --git a/src/views/modules/base/huji/chusheng/index.vue b/src/views/modules/base/huji/chusheng/index.vue
index 84baa54ed..358e44482 100644
--- a/src/views/modules/base/huji/chusheng/index.vue
+++ b/src/views/modules/base/huji/chusheng/index.vue
@@ -88,7 +88,7 @@
 
         <el-form-item label="姓名"
                       prop="name">
-          <el-input v-model="fmData.name"
+          <el-input v-model.trim="fmData.name"
                     class="u-item-width-normal"
                     size="small"
                     clearable
@@ -98,7 +98,7 @@
 
         <el-form-item label="联系电话"
                       prop="mobile">
-          <el-input v-model="fmData.mobile"
+          <el-input v-model.trim="fmData.mobile"
                     class="u-item-width-normal"
                     size="small"
                     clearable
@@ -108,7 +108,7 @@
 
         <el-form-item label="证件号"
                       prop="idCard">
-          <el-input v-model="fmData.idCard"
+          <el-input v-model.trim="fmData.idCard"
                     class="u-item-width-normal"
                     size="small"
                     clearable
@@ -118,7 +118,7 @@
 
         <el-form-item label="出生日期"
                       prop="birthdayTime">
-          <el-date-picker v-model="fmData.birthdayTime"
+          <el-date-picker v-model.trim="fmData.birthdayTime"
                           type="daterange"
                           class="u-item-width-daterange2"
                           range-separator="至"
diff --git a/src/views/modules/base/huji/houseChange/houseChangeList.vue b/src/views/modules/base/huji/houseChange/houseChangeList.vue
index 1b0638f95..bf9c60960 100644
--- a/src/views/modules/base/huji/houseChange/houseChangeList.vue
+++ b/src/views/modules/base/huji/houseChange/houseChangeList.vue
@@ -10,7 +10,7 @@
           <el-form-item label="所属网格"
                         prop="gridId">
             <el-select class="item_width_1"
-                       v-model="formData.gridId"
+                       v-model.trim="formData.gridId"
                        placeholder="全部"
                        size="small"
                        @change="handleChangeG"
@@ -96,7 +96,7 @@
         <div>
           <el-form-item label="变更时间"
                         prop="startDate">
-            <el-date-picker v-model="timeRange"
+            <el-date-picker v-model.trim="timeRange"
                             size="small"
                             type="daterange"
                             value-format="yyyy-MM-dd"
diff --git a/src/views/modules/base/huji/immigration/edit.vue b/src/views/modules/base/huji/immigration/edit.vue
index 10164324a..461b55005 100644
--- a/src/views/modules/base/huji/immigration/edit.vue
+++ b/src/views/modules/base/huji/immigration/edit.vue
@@ -46,31 +46,31 @@
 
                 <el-form-item label="姓名" prop="name" style="display: block">
                     <el-input class="u-edit-width-normal" style="margin-right: 20px" placeholder="请输入姓名	"
-                        v-model="fmData.name" :disabled="formType === 'edit'" maxlength="30">
+                        v-model.trim="fmData.name" :disabled="formType === 'edit'" maxlength="30">
                     </el-input>
                     <div>
-                        <!-- <el-checkbox v-model="fmData.isWelfare"
+                        <!-- <el-checkbox v-model.trim="fmData.isWelfare"
                          true-label="1"
                          false-label="0">享受福利</el-checkbox> -->
 
                         <template v-if="formType === 'edit'">
-                            <el-checkbox v-model="fmData.isCheck" true-label="1" false-label="0" :disabled="initCheck == 1"
+                            <el-checkbox v-model.trim="fmData.isCheck" true-label="1" false-label="0" :disabled="initCheck == 1"
                                 @change="checkResiAvailable">补充居民信息</el-checkbox>
                         </template>
 
-                        <el-checkbox v-else v-model="fmData.isCheck" true-label="1" false-label="0"
+                        <el-checkbox v-else v-model.trim="fmData.isCheck" true-label="1" false-label="0"
                             @change="checkResiAvailable">补充居民信息</el-checkbox>
                     </div>
                 </el-form-item>
 
                 <el-form-item label="联系电话" prop="mobile" style="display: block">
                     <el-input class="u-edit-width-normal" type="number" maxlength="11" show-word-limit
-                        placeholder="请输入联系电话	" :disabled="formType === 'edit'" v-model="fmData.mobile">
+                        placeholder="请输入联系电话	" :disabled="formType === 'edit'" v-model.trim="fmData.mobile">
                     </el-input>
                 </el-form-item>
 
                 <el-form-item label="证件号" prop="idCard" style="display: block">
-                    <el-input class="u-edit-width-normal" placeholder="请输入证件号或护照号" v-model="fmData.idCard"
+                    <el-input class="u-edit-width-normal" placeholder="请输入证件号或护照号" v-model.trim="fmData.idCard"
                         :disabled="formType === 'edit'" @blur="handleBlurId"></el-input>
                 </el-form-item>
 
@@ -83,38 +83,38 @@
                 </el-form-item>
                 <el-form-item label="年龄" prop="age" style="display: block">
                     <el-input class="u-edit-width-normal" type="number" show-word-limit placeholder="请输入"
-                        v-model="fmData.age" :disabled="true">
+                        v-model.trim="fmData.age" :disabled="true">
                     </el-input>
                 </el-form-item>
 
                 <el-form-item label="迁入日期" prop="inTime" style="display: block">
-                    <el-date-picker v-model="fmData.inTime" type="date" placeholder="迁入时间" value-format="yyyy-MM-dd"
+                    <el-date-picker v-model.trim="fmData.inTime" type="date" placeholder="迁入时间" value-format="yyyy-MM-dd"
                         class="u-edit-width-normal" :disabled="formType === 'edit'">
                     </el-date-picker>
                 </el-form-item>
 
                 <el-form-item label="迁入原因" prop="inReason" style="display: block">
-                    <el-input type="textarea" class="u-edit-width-normal" placeholder="请输入迁入原因" v-model="fmData.inReason">
+                    <el-input type="textarea" class="u-edit-width-normal" placeholder="请输入迁入原因" v-model.trim="fmData.inReason">
                     </el-input>
                 </el-form-item>
 
                 <el-form-item label="来源地" prop="sourceAddress" style="display: block">
 
-                    <el-cascader ref="nowArea" class="u-edit-width-normal" :props="areaProps" v-model="nowAllCode" clearable
+                    <el-cascader ref="nowArea" class="u-edit-width-normal" :props="areaProps" v-model.trim="nowAllCode" clearable
                         @change="handleNowArea"></el-cascader>
 
                 </el-form-item>
                 <el-form-item label="详细地址" prop="address" style="display: block">
-                    <el-input class="u-edit-width-normal" placeholder="请输入详细地址" v-model="fmData.address">
+                    <el-input class="u-edit-width-normal" placeholder="请输入详细地址" v-model.trim="fmData.address">
                     </el-input>
                 </el-form-item>
                 <el-form-item label="迁移证号码" prop="moveNumber" style="display: block">
-                    <el-input class="u-edit-width-normal" placeholder="请输入迁移证号码" v-model="fmData.moveNumber">
+                    <el-input class="u-edit-width-normal" placeholder="请输入迁移证号码" v-model.trim="fmData.moveNumber">
                     </el-input>
                 </el-form-item>
 
                 <el-form-item label="户主姓名" prop="householderName" style="display: block">
-                    <el-input class="u-edit-width-normal" placeholder="请输入户主姓名" v-model="fmData.householderName">
+                    <el-input class="u-edit-width-normal" placeholder="请输入户主姓名" v-model.trim="fmData.householderName">
                     </el-input>
                 </el-form-item>
 
diff --git a/src/views/modules/base/huji/immigration/index.vue b/src/views/modules/base/huji/immigration/index.vue
index 21ba6ae09..4966dd5fa 100644
--- a/src/views/modules/base/huji/immigration/index.vue
+++ b/src/views/modules/base/huji/immigration/index.vue
@@ -97,7 +97,7 @@
 
 				<el-form-item label="姓名" prop="name">
 					<el-input
-						v-model="fmData.name"
+						v-model.trim="fmData.name"
 						class="u-item-width-normal"
 						size="small"
 						clearable
@@ -108,7 +108,7 @@
 
 				<el-form-item label="联系电话" prop="mobile">
 					<el-input
-						v-model="fmData.mobile"
+						v-model.trim="fmData.mobile"
 						class="u-item-width-normal"
 						size="small"
 						clearable
@@ -119,7 +119,7 @@
 
 				<el-form-item label="证件号" prop="idCard">
 					<el-input
-						v-model="fmData.idCard"
+						v-model.trim="fmData.idCard"
 						class="u-item-width-normal"
 						size="small"
 						clearable
@@ -130,7 +130,7 @@
 
 				<el-form-item label="迁入时间" prop="startTime">
 					<el-date-picker
-						v-model="rangeTime"
+						v-model.trim="rangeTime"
 						type="daterange"
 						range-separator="至"
 						start-placeholder="开始日期"
diff --git a/src/views/modules/base/migration/records/index.vue b/src/views/modules/base/migration/records/index.vue
index f6ab5b26f..acd8c6431 100644
--- a/src/views/modules/base/migration/records/index.vue
+++ b/src/views/modules/base/migration/records/index.vue
@@ -5,109 +5,69 @@
     <div class="m-table">
       <div class="div_btn">
         <div class="div_btn_left">
-          <el-button class="diy-button--add" size="small"
-                     type="primary" @click="handleAdd('community')">
+          <el-button class="diy-button--add" size="small" type="primary" @click="handleAdd('community')">
             迁移小区
           </el-button>
-          <el-button class="diy-button--add" size="small"
-                     type="primary" @click="handleAdd('building')">
+          <el-button class="diy-button--add" size="small" type="primary" @click="handleAdd('building')">
             迁移楼栋
           </el-button>
 
         </div>
       </div>
-      <el-table
-          ref="ref_table"
-          v-loading="tableLoading"
-          :data="tableData"
-          :height="tableHeight"
-          border
-          class="m-table-item"
-          style="width: 100%"
-      >
-        <el-table-column align="center" label="序号" type="index" width="50"/>
-        <el-table-column
-            label="迁移主体类型"
-            prop="subjectType"
-            width="120"
-        >
+      <el-table ref="ref_table" v-loading="tableLoading" :data="tableData" :height="tableHeight" border
+        class="m-table-item" style="width: 100%">
+        <el-table-column align="center" label="序号" type="index" width="50" />
+        <el-table-column label="迁移主体类型" prop="subjectType" width="120">
           <template slot-scope="{row}">
             {{
-              row.subjectType === 'building' ? '楼栋' :
-                  row.subjectType === 'quarters' ? '小区' : ''
-            }}
+            row.subjectType === 'building' ? '楼栋' :
+              row.subjectType === 'quarters' ? '小区' : ''
+          }}
           </template>
         </el-table-column>
-        <el-table-column
-            label="迁移主体名称"
-            prop="subjectName"
-            width="200"
-        />
-        <el-table-column
-            label="来源名称"
-            prop="sourceName"
-            width="200"
-        />
-        <el-table-column
-            label="目标名称"
-            prop="targetName"
-            width="200"
-        />
-        <el-table-column
-            label="状态"
-            prop="status"
-            width="100"
-        >
+        <el-table-column label="迁移主体名称" prop="subjectName" width="200" />
+        <el-table-column label="来源名称" prop="sourceName" width="200" />
+        <el-table-column label="目标名称" prop="targetName" width="200" />
+        <el-table-column label="状态" prop="status" width="100">
           <template slot-scope="{row}">
-            <el-tag :type="
-              row.status === -1 ? 'danger' :
+            <el-tag :type="row.status === -1 ? 'danger' :
               row.status === 0 ? 'warning' :
-              row.status === 1 ? 'info' :
-              row.status === 2 ? 'success' : ''
-">
+                row.status === 1 ? 'info' :
+                  row.status === 2 ? 'success' : ''
+            ">
               {{
-                row.status === -1 ? '失败' :
-                    row.status === 0 ? '未开始' :
-                        row.status === 1 ? '执行中' :
-                            row.status === 2 ? '成功' : ''
-              }}
+            row.status === -1 ? '失败' :
+              row.status === 0 ? '未开始' :
+                row.status === 1 ? '执行中' :
+                  row.status === 2 ? '成功' : ''
+          }}
             </el-tag>
           </template>
         </el-table-column>
-        <el-table-column
-            label="备注"
-            prop="remark"
-            show-overflow-tooltip
-        />
+        <el-table-column label="备注" prop="remark" show-overflow-tooltip />
       </el-table>
       <div>
-        <el-pagination
-            :current-page.sync="pageNo"
-            :page-size="parseInt(pageSize)"
-            :page-sizes="[20, 50, 100, 200]"
-            :total="total"
-            layout="sizes, prev, pager, next, total"
-            @size-change="handleSizeChange"
-            @current-change="handleCurrentChange"
-        >
+        <el-pagination :current-page.sync="pageNo" :page-size="parseInt(pageSize)" :page-sizes="[20, 50, 100, 200]"
+          :total="total" layout="sizes, prev, pager, next, total" @size-change="handleSizeChange"
+          @current-change="handleCurrentChange">
         </el-pagination>
       </div>
     </div>
-    <transferBuilding v-if="transferBuildingDialog" @close="transferBuildingDialog=false" @ok="getTableData"/>
-    <transferCommunity v-if="transferCommunityDialog" @close="transferCommunityDialog=false" @ok="getTableData"/>
+    <transferBuilding v-if="transferBuildingDialog" @close="transferBuildingDialog = false" @ok="getTableData" />
+    <transferCommunity v-if="transferCommunityDialog" @close="transferCommunityDialog = false" @ok="getTableData" />
 
   </div>
 </template>
 
 <script>
-import {requestGet, requestPost} from "@/js/dai/request"
-import {mapGetters} from "vuex"
+import { requestGet, requestPost } from "@/js/dai/request"
+import { mapGetters } from "vuex"
 import transferBuilding from "@/views/modules/base/migration/records/transferBuilding.vue";
 import transferCommunity from "@/views/modules/base/migration/records/transferCommunity.vue";
 
 export default {
   name: 'records',
-  components: {transferBuilding, transferCommunity},
+  components: { transferBuilding, transferCommunity },
   data() {
     return {
       pageNo: 1,
@@ -155,8 +115,8 @@ export default {
     async getTableData() {
       this.tableLoading = true
       const url = "/actual/base/baseDataTransfer/recordList"
-      const {pageSize, pageNo} = this
-      const {data, code, msg} = await requestGet(url, {
+      const { pageSize, pageNo } = this
+      const { data, code, msg } = await requestGet(url, {
         pageSize,
         pageNo,
       })
@@ -168,11 +128,11 @@ export default {
     }
   },
 };
+
+
 </script>
 
 <style lang="scss" scoped>
-
 @import "@/assets/scss/modules/management/list-main.scss";
 @import "@/assets/scss/buttonstyle.scss";
-
 </style>
diff --git a/src/views/modules/base/migration/records/transferBuilding.vue b/src/views/modules/base/migration/records/transferBuilding.vue
index 4fcd918fb..d5645315a 100644
--- a/src/views/modules/base/migration/records/transferBuilding.vue
+++ b/src/views/modules/base/migration/records/transferBuilding.vue
@@ -10,7 +10,7 @@
     <el-form ref="form" :model="form" label-width="100px">
       <el-form-item label="迁出楼栋">
         <el-cascader
-            v-model="form.subjectId"
+            v-model.trim="form.subjectId"
             :options="treeData"
             :props="props"
             style="width: 100%"
@@ -20,7 +20,7 @@
       </el-form-item>
       <el-form-item label="迁入小区" prop="gridId">
         <el-cascader
-            v-model="form.targetId"
+            v-model.trim="form.targetId"
             :options="treeData"
             :props="props2"
             style="width: 100%"
diff --git a/src/views/modules/base/migration/records/transferCommunity.vue b/src/views/modules/base/migration/records/transferCommunity.vue
index 030f70c9f..664bf67b1 100644
--- a/src/views/modules/base/migration/records/transferCommunity.vue
+++ b/src/views/modules/base/migration/records/transferCommunity.vue
@@ -10,7 +10,7 @@
     <el-form ref="form" :model="form" label-width="100px">
       <el-form-item label="迁出小区">
         <el-cascader
-            v-model="form.subjectId"
+            v-model.trim="form.subjectId"
             :options="treeData"
             ref="cascaderV"
             :props="props"
@@ -21,7 +21,7 @@
       </el-form-item>
       <el-form-item label="迁入网格" prop="gridId">
         <el-cascader
-            v-model="form.targetId"
+            v-model.trim="form.targetId"
             :options="treeData"
             :props="props2"
             ref="cascaderG"
diff --git a/src/views/modules/base/nonIntResi/nonIntResi.vue b/src/views/modules/base/nonIntResi/nonIntResi.vue
new file mode 100644
index 000000000..7e5293f3d
--- /dev/null
+++ b/src/views/modules/base/nonIntResi/nonIntResi.vue
@@ -0,0 +1,624 @@
+<template>
+  <div class="g-main">
+    <div>
+      <div class="m-search">
+        <el-form
+          :inline="true"
+          :model="formData"
+          ref="ref_searchform"
+          :label-width="'105px'"
+        >
+          <el-form-item label="名称模糊查询">
+            <el-select
+              v-model.trim="basicType"
+              class="u-item-width-service"
+              clearable
+              size="small"
+            >
+              <template>
+                <el-option
+                  @click.native="handelClickBasicType"
+                  :label="item.label"
+                  :value="item.value"
+                  v-for="(item, index) in basicInfoList"
+                  :key="index"
+                >
+                </el-option>
+              </template>
+            </el-select>
+          </el-form-item>
+          <el-form-item
+            v-for="(item, index) in basicInfoList"
+            :key="index"
+            v-if="basicType == item.value"
+          >
+            <el-input
+              v-model.trim="formData[item.value]"
+              class="u-item-width-service"
+              placeholder="请输入"
+              clearable
+              size="small"
+            >
+            </el-input>
+          </el-form-item>
+
+          <el-form-item label="性别">
+            <el-select
+              v-model.trim="formData.gender"
+              placeholder="请输入"
+              size="small"
+              class="u-item-width-normal"
+              clearable
+            >
+              <el-option
+                v-for="item in genderList"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              >
+              </el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="居民年龄">
+            <el-input
+              v-model.trim="formData.ageFrom"
+              @change="handleAgeChange"
+              class="u-item-width-daterange"
+              placeholder="请输入"
+              clearable
+              size="small"
+            >
+            </el-input>
+            <span class="u-data-tag">至</span>
+            <el-input
+              v-model.trim="formData.ageTo"
+              @change="handleAgeChange"
+              class="u-item-width-daterange u-data-tag"
+              placeholder="请输入"
+              clearable
+              size="small"
+            >
+            </el-input>
+          </el-form-item>
+          <el-form-item label="完整度得分">
+          <el-input v-model.trim="formData.integrityScoreFrom" @change="informationChange(formData.integrityScoreFrom,'from')" class="u-item-width-daterange" placeholder="请输入" clearable size="small">
+          </el-input>
+          <span class="u-data-tag">至</span>
+          <el-input v-model.trim="formData.integrityScoreTo"  @change="informationChange(formData.integrityScoreTo,'to')"  class="u-item-width-daterange u-data-tag"
+            placeholder="请输入" clearable size="small">
+          </el-input>
+        </el-form-item>
+          <el-row type="flex">
+            <el-col :span="24" align="right">
+              <el-button
+                style="margin-left: 30px"
+                size="small"
+                type="primary "
+                @click="handleSearch"
+                >查询</el-button
+              >
+              <el-button
+                style="margin-left: 10px"
+                is-plain
+                class="diy-button--white el-button--default"
+                size="small"
+                @click="resetSearch"
+                >重置</el-button
+              >
+            </el-col>
+          </el-row>
+        </el-form>
+      </div>
+
+      <div class="m-table">
+        <div class="div_btn">
+          <div class="div_btn_left">
+            <el-button
+              size="small"
+              @click="handleAdd"
+              type="primary"
+              icon="el-icon-plus"
+              >新增居民</el-button
+            >
+          </div>
+          <!-- <el-button
+            @click="handleExport"
+            type="primary"
+            size="small"
+            class="diy-button--white el-button--default"
+            >导出</el-button
+          > -->
+          <!-- <el-button
+            @click="onDeleteBatch"
+            style="margin: 0 10px"
+            size="small"
+            type="primary"
+          >
+            批量删除
+          </el-button> -->
+        </div>
+
+        <el-table
+          :data="tableData"
+          border
+          v-loading="tableLoading"
+          class="m-table-item"
+          style="width: 100%"
+          :height="maxTableHeight"
+          @selection-change="onMultiSelection"
+        >
+          <el-table-column
+            type="selection"
+            fixed="left"
+            align="center"
+            width="50"
+          />
+
+          <el-table-column
+            prop="resiName"
+            align="center"
+            width="100"
+            label="姓名"
+            :show-overflow-tooltip="true"
+          >
+          </el-table-column>
+
+          <el-table-column
+            prop="genderName"
+            align="center"
+            width="80"
+            label="性别"
+            :show-overflow-tooltip="true"
+          >
+            <template slot-scope="scope">
+              <span>{{
+                scope.row.gender
+                  ? scope.row.gender == "1"
+                    ? "男"
+                    : scope.row.gender == "2"
+                    ? "女"
+                    : "--"
+                  : "--"
+              }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="age"
+            align="center"
+            width="50"
+            label="年龄"
+            :show-overflow-tooltip="true"
+          >
+          </el-table-column>
+          <el-table-column
+            prop="mobile"
+            align="center"
+            width="150"
+            label="联系电话"
+            :show-overflow-tooltip="true"
+          >
+          </el-table-column>
+          <el-table-column
+            prop="idNum"
+            align="center"
+            width="200"
+            label="证件号"
+            :show-overflow-tooltip="true"
+          >
+          </el-table-column>
+
+          <el-table-column
+            prop="homeFullName"
+            align="center"
+            width="300"
+            label="居住房屋"
+            :show-overflow-tooltip="true"
+          >
+          </el-table-column>
+          <el-table-column
+            prop="resiCategoriesStr"
+            align="center"
+            label="居民分类"
+            :show-overflow-tooltip="true"
+          >
+          </el-table-column>
+          <el-table-column
+            prop="partyFlag"
+            align="center"
+            width="100"
+            label="政治面貌"
+            :show-overflow-tooltip="true"
+          >
+            <template slot-scope="scope">
+              {{
+                scope.row.gender
+                  ? scope.row.partyFlag === 1
+                    ? "党员"
+                    : scope.row.partyFlag === 2
+                    ? "共青团员"
+                    : scope.row.partyFlag === 0
+                    ? "群众"
+                    : "--"
+                  : "--"
+              }}
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="synthesizeScore"
+            align="center"
+            width="100"
+            label="完整度得分"
+            :show-overflow-tooltip="true"
+          >
+          </el-table-column>
+          <el-table-column
+            prop="updateTime"
+            align="center"
+            width="100"
+            label="最近更新时间"
+            :show-overflow-tooltip="true"
+          >
+          </el-table-column>
+          <el-table-column
+            fixed="right"
+            label="操作"
+            align="center"
+            width="120"
+          >
+            <template slot-scope="scope">
+              <el-button
+                @click="handleLook(scope.row)"
+                type="text"
+                size="small"
+                >查看</el-button
+              >
+              <el-button @click="handleEdit(scope.row)" type="text" size="small"
+                >编辑</el-button
+              >
+            </template>
+          </el-table-column>
+        </el-table>
+
+        <div>
+          <el-pagination
+            @size-change="handleSizeChange"
+            @current-change="handleCurrentChange"
+            :current-page.sync="pageNo"
+            :page-sizes="[20, 50, 100, 200]"
+            :page-size="parseInt(pageSize)"
+            layout="sizes, prev, pager, next, total"
+            :total="total"
+          >
+          </el-pagination>
+        </div>
+      </div>
+    </div>
+    <el-dialog title="密码验证" :visible.sync="showCheckPassword">
+      <el-form
+        :model="checkPasswordFrom"
+        :rules="checkPasswordRulse"
+        ref="checkPasswordFrom"
+      >
+        <el-form-item label="密码" prop="password">
+          <el-input
+            v-model.trim="checkPasswordFrom.password"
+            autocomplete="off"
+            type="password"
+            placeholder="请输入当前账号密码"
+            @keydown.native.enter="handelClickCheckPassword"
+          ></el-input>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="showCheckPassword = false">取 消</el-button>
+        <el-button type="primary" @click="handelClickCheckPassword"
+          >确 定</el-button
+        >
+      </div>
+    </el-dialog>
+  </div>
+</template>
+    
+      <script>
+import { requestPost, requestGet } from "@/js/dai/request";
+import nextTick from "dai-js/tools/nextTick";
+import { genderList } from "@/js/columns/constants";
+import { mapGetters } from "vuex";
+import axios from "axios";
+export default {
+  components: {},
+
+  data() {
+    return {
+      tableLoading: false,
+      user: {},
+      agencyId: "",
+      searchH: 170,
+      tableData: [],
+      genderList,
+      editUserId: "",
+      showCheckPassword:false,
+      formData: {
+        ageFrom: "",
+        ageTo: "",
+        resiName: "",
+        mobile: "",
+        idNum: "",
+        nativePlace: "",
+        gender: "",
+      },
+      pageNo: 1,
+      pageSize: window.localStorage.getItem("pageSize") || 20,
+      checkPasswordFrom: {
+        password: "",
+      },
+      checkPasswordRulse: {
+        password: [
+          { required: true, message: "请输入密码", trigger: "blur" },
+          {
+            min: 6,
+            max: 18,
+            message: "长度在 6 到 18 个字符",
+            trigger: "blur",
+          },
+        ],
+      },
+      total: 0,
+      
+      basicType: "resiName",
+      basicInfoList: [
+        {
+          label: "姓名",
+          value: "resiName",
+        },
+        {
+          label: "联系电话",
+          value: "mobile",
+        },
+        {
+          label: "证件号",
+          value: "idNum",
+        },
+      ],
+    };
+  },
+  computed: {
+    maxTableHeight() {
+      const h = this.clientHeight - this.searchH - 330 + this.iframeHeight;
+      const _h = this.clientHeight - 250 - this.searchH;
+      return this.$store.state.inIframe ? h : _h;
+    },
+    ...mapGetters(["clientHeight", "iframeHeight"]),
+  },
+  watch: {
+    "$route.query"(newVal, oldVal) {
+      this.getTableData();
+    },
+  },
+  async created() {
+    // await this.getDicts();
+  },
+  mounted() {
+    console.log(this.$store.state);
+    this.user = this.$store.state.user;
+    this.agencyId = this.user.agencyId;
+    this.getTableData();
+  },
+  methods: {
+    // --------------------------------------字典------------------------------------------
+    async getDicts() {
+      try {
+        const requests = [
+          this.$http.post("sys/dict/data/nation", {
+            formCode: "resi_base_info",
+          }),
+          this.$http.post("sys/dict/data/education", {
+            formCode: "resi_base_info",
+          }),
+        ];
+        const dictKeys = ["nationList", "educationList"]; // 对应的键名
+
+        const results = await Promise.all(requests);
+        results.forEach((result, index) => {
+          if (result.data.code === 0) {
+            this.dicts[dictKeys[index]].push(...result.data.data);
+          } else {
+            console.log(`获取${dictKeys[index]}失败: ${result.data.msg}`);
+          }
+        });
+      } catch (error) {
+        console.log("获取字典失败: ", error);
+      }
+    },
+    // ------------------------------------事件------------------------------------------
+    handelClickBasicType() {
+      this.formData.name = "";
+      this.formData.mobile = "";
+      this.formData.idNum = "";
+      this.formData.nativePlace = "";
+      this.formData.remark = "";
+    },
+    handleAgeChange() {
+      if (this.formData.ageStart && this.formData.ageEnd) {
+        if (this.formData.ageStart > this.formData.ageEnd) {
+          this.$message.warning("结束年龄不能小于开始年龄");
+        }
+      }
+    },
+    informationChange(val,type) {
+      if(isNaN(val)){
+        this.$message.warning('请输入数字');
+        if(type === 'from'){
+          this.formData.integrityScoreFrom = null;
+        }else{
+          this.formData.integrityScoreTo = null;
+        }
+      }
+      if (this.formData.integrityScoreFrom&&this.formData.integrityScoreTo) {
+        if (this.formData.integrityScoreFrom > this.formData.integrityScoreTo) {
+          this.$message.warning('结束分数不能小于开始分数')
+        }
+      }
+    },
+    // 搜索事件
+    handleSearch(val) {
+      console.log(this.formData);
+      this.pageNo = 1;
+      this.getTableData();
+    },
+
+    async handleAdd() {
+      this.$router.push({ name: "add-resi" });
+    },
+    //   查看详情触发事件
+    async handleLook(row) {
+      this.lookResiId = row.resiId;
+      let {
+        agencyId,
+        gridId,
+        gridName,
+        gender,
+        homeId,
+        homeName,
+        resiName,
+        resiId,
+      } = row;
+      this.$store.dispatch("saveData", {
+        agencyId,
+        gridId,
+        gridName,
+        gender,
+        homeId,
+        homeName,
+        name:resiName,
+        resiId,
+      });
+      this.$router.push({ name: "jumin-huaxiang" });
+      this.$store.state.contentTabs = this.$store.state.contentTabs.map(
+        (item) => {
+          if (item.name === "jumin-huaxiang") {
+            return { ...item, title: name };
+          }
+          return item;
+        }
+      );
+    },
+    //   编辑触发事件
+    async handleEdit(row) {
+      this.editUserId = row.resiId;
+      this.showCheckPassword = true;
+    },
+  
+    //   获取列表
+    async getTableData() {
+      this.tableLoading = true;
+      const url =
+        "/actual/base/residentIntegrity/resiCategoryStats/nonIntResiList";
+        const query = this.$route.query;
+      this.houseId = query.houseId;
+      const { pageSize, pageNo, formData } = this;
+      const { data, code, msg } = await requestGet(url, {
+        pageSize,
+        pageNo,
+        resultScopeType: this.$route.query.type || null,
+        resiCategory: this.$route.query.resiCategory || null, //首页传参进来
+        ...formData,
+      });
+      data.list.forEach((item) => {
+          if (item.resiCategories) {
+            item.resiCategoriesStr = item.resiCategories
+              .map((item) => item.categoryName)
+              .join(",");
+          }
+      });
+      this.tableLoading = false;
+      if (code === 0) {
+        this.total = data.total || 0;
+        this.tableData = data.list;
+      } else {
+        this.$message.error(msg);
+      }
+    },
+    // 密码验证
+    handelClickCheckPassword() {
+      this.$refs.checkPasswordFrom.validate(async (vali) => {
+        if (vali) {
+          const url = `/actual/base/residentBaseInfo/getResiUserInfo/${this.editUserId}`;
+          let parm = {
+            password: this.checkPasswordFrom.password,
+          };
+          const { data, code, msg } = await requestPost(url, parm);
+          if (code === 0) {
+            this.showCheckPassword = false;
+            this.$router.push({
+              name: "edit-resi",
+              query: { id: this.editUserId },
+              params: { idNum: data.idNum, mobile: data.mobile,name:data.name },
+            });
+            this.checkPasswordFrom.password = "";
+          } else {
+            this.$message.error(msg);
+          }
+        } else {
+          return false;
+        }
+      });
+    },
+    //   分页
+    handleSizeChange(val) {
+      this.pageSize = val;
+      window.localStorage.setItem("pageSize", val);
+      this.getTableData();
+    },
+
+    //   分页
+    handleCurrentChange(val) {
+      this.pageNo = val;
+      this.getTableData();
+    },
+    //   重置
+    resetSearch() {
+      this.formData = {};
+      this.pageNo = 1;
+      this.getTableData();
+    },
+    // 多选事件
+    onMultiSelection(rows) {
+      this.multiSelection = rows;
+    },
+
+    // 批量删除
+    onDeleteBatch() {
+      if (this.multiSelection.length == 0) {
+        this.$message.warning("请先选中至少一项");
+        return;
+      }
+
+      this.$confirm("删除之后无法恢复，确认删除？", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+          this.cancelFuwu(this.multiSelection.map((e) => e.categorizedResiId));
+        })
+        .catch((err) => {
+          console.error(err);
+          this.$message.error("删除失败");
+        });
+    },
+  },
+
+  props: {},
+};
+</script>
+  <style lang="scss" scoped>
+@import "@/assets/scss/buttonstyle.scss";
+@import "@/assets/scss/modules/management/list-main.scss";
+@import "@/assets/scss/modules/shequzhili/event-info.scss";
+.div_btn_left > * {
+  margin-right: 10px;
+}
+</style>
+    
+    
\ No newline at end of file
diff --git a/src/views/modules/base/organization/organization.vue b/src/views/modules/base/organization/organization.vue
index 01473ceb3..a4dd01b13 100644
--- a/src/views/modules/base/organization/organization.vue
+++ b/src/views/modules/base/organization/organization.vue
@@ -290,22 +290,22 @@
                :rules="rules">
         <el-form-item label="部门名称"
                       prop="addDepartmentName">
-          <el-input v-model="insertForm.departmentName"
+          <el-input v-model.trim="insertForm.departmentName"
                     placeholder="请输入部门名称"></el-input>
         </el-form-item>
         <el-form-item label="组织编码"
                       prop="code">
-          <el-input v-model="insertForm.code"
+          <el-input v-model.trim="insertForm.code"
                     placeholder="请输入组织编码"></el-input>
         </el-form-item>
         <el-form-item label="联系人"
                       prop="contacts">
-          <el-input v-model="insertForm.contacts"
+          <el-input v-model.trim="insertForm.contacts"
                     placeholder="请输入联系人姓名"></el-input>
         </el-form-item>
         <el-form-item label="联系电话"
                       prop="mobile">
-          <el-input v-model="insertForm.mobile"
+          <el-input v-model.trim="insertForm.mobile"
                     placeholder="请输入联系电话"></el-input>
         </el-form-item>
       </el-form>
@@ -326,19 +326,19 @@
                  :rules="rules">
           <el-form-item label="网格名称"
                         prop="gridName">
-            <el-input v-model="GridForm.gridName"
+            <el-input v-model.trim="GridForm.gridName"
                       placeholder="请输入部门名称"></el-input>
           </el-form-item>
           <el-form-item label="网格编码"
                         prop="GridCode">
-            <el-input v-model="GridForm.code"
+            <el-input v-model.trim="GridForm.code"
                       placeholder="请输入网格编码"></el-input>
           </el-form-item>
 
           <!-- 网格类型，下拉框 -->
           <el-form-item label="网格类型"
                         prop="typeTag">
-            <el-select v-model="GridForm.gridType"
+            <el-select v-model.trim="GridForm.gridType"
                        clearable
                        placeholder="网格类型">
               <el-option v-for="item in typeList"
@@ -351,12 +351,12 @@
 
           <el-form-item label="联系人"
                         prop="GridContacts">
-            <el-input v-model="GridForm.contacts"
+            <el-input v-model.trim="GridForm.contacts"
                       placeholder="请输入联系人姓名"></el-input>
           </el-form-item>
           <el-form-item label="联系电话"
                         prop="GridMobile">
-            <el-input v-model="GridForm.mobile"
+            <el-input v-model.trim="GridForm.mobile"
                       placeholder="请输入联系电话"></el-input>
           </el-form-item>
 
@@ -369,7 +369,7 @@
         >
           <div style="width: 500px">
             <el-select
-              v-model="searchValue"
+              v-model.trim="searchValue"
               filterable
               style="width: 500px"
               remote
@@ -412,23 +412,23 @@
                  :rules="rulesPeo">
           <el-form-item label="姓名"
                         prop="name">
-            <el-input v-model="peoForm.name"
+            <el-input v-model.trim="peoForm.name"
                       placeholder="请输入姓名"></el-input>
           </el-form-item>
           <el-form-item label="联系电话"
                         prop="mobile">
-            <el-input v-model="peoForm.mobile"
+            <el-input v-model.trim="peoForm.mobile"
                       placeholder="请输入联系电话"></el-input>
           </el-form-item>
           <el-form-item label="证件号"
                         prop="idCard">
-            <el-input v-model="peoForm.idCard"
+            <el-input v-model.trim="peoForm.idCard"
                       placeholder="请输入证件号"></el-input>
           </el-form-item>
           <!-- 性别下拉框 -->
           <el-form-item label="性别"
                         prop="gender">
-            <el-select v-model="peoForm.gender"
+            <el-select v-model.trim="peoForm.gender"
                        clearable
                        placeholder="性别">
               <el-option v-for="item in genderList"
@@ -441,7 +441,7 @@
           <!-- 专兼职下拉框 -->
           <el-form-item label="专兼职"
                         prop="post">
-            <el-select v-model="peoForm.post"
+            <el-select v-model.trim="peoForm.post"
                        clearable
                        placeholder="专兼职">
               <el-option v-for="item in postList"
@@ -454,7 +454,7 @@
           <!-- 职责下拉框 -->
           <el-form-item label="职责"
                         prop="duty">
-            <el-select v-model="peoForm.duty"
+            <el-select v-model.trim="peoForm.duty"
                        multiple
                        placeholder="请选择">
               <el-option v-for="item in dutyList"
@@ -468,7 +468,7 @@
 
           <el-form-item label="角色"
                         prop="newRoles">
-            <el-select v-model="peoForm.newRoles"
+            <el-select v-model.trim="peoForm.newRoles"
                        multiple
                        placeholder="请选择">
               <el-option v-for="item in roleList"
@@ -484,7 +484,7 @@
             <el-cascader class="u-item-width-normal"
                        size="small"
                        ref="myCascader"
-                       v-model="peoForm.manageScopes"
+                       v-model.trim="peoForm.manageScopes"
                        :options="orgOptions"
                        :props="orgOptionProps"
                        :show-all-levels="true"
@@ -508,7 +508,7 @@
                  ref="addPeoAgencyForm"
                  :rules="rulesAgencyPeo">
           <el-form-item label="工作人员" prop="selectedList">
-            <el-select v-model="peoFormAgency.selectedList"
+            <el-select v-model.trim="peoFormAgency.selectedList"
                        multiple
                       placeholder="请选择"
                        >
@@ -541,22 +541,22 @@
                :rules="rulesPeo">
         <el-form-item label="姓名"
                       prop="name">
-          <el-input v-model="peoForm.name"
+          <el-input v-model.trim="peoForm.name"
                     placeholder="请输入姓名"></el-input>
         </el-form-item>
         <el-form-item label="联系电话"
                       prop="mobile">
-          <el-input v-model="peoForm.mobile"
+          <el-input v-model.trim="peoForm.mobile"
                     placeholder="请输入联系电话"></el-input>
         </el-form-item>
         <el-form-item label="证件号"
                       prop="mobile">
-          <el-input v-model="peoForm.idCard"
+          <el-input v-model.trim="peoForm.idCard"
                     placeholder="请输入证件号"></el-input>
         </el-form-item>
         <el-form-item label="性别"
                       prop="gender">
-          <el-select v-model="peoForm.gender"
+          <el-select v-model.trim="peoForm.gender"
                      clearable
                      placeholder="性别">
             <el-option v-for="item in genderList"
@@ -568,7 +568,7 @@
         </el-form-item>
         <el-form-item label="专兼职"
                       prop="post">
-          <el-select v-model="peoForm.post"
+          <el-select v-model.trim="peoForm.post"
                      clearable
                      placeholder="专兼职">
             <el-option v-for="item in postList"
@@ -580,7 +580,7 @@
         </el-form-item>
         <el-form-item label="职责"
                       prop="duty">
-          <el-select v-model="peoForm.duty"
+          <el-select v-model.trim="peoForm.duty"
                      multiple
                      placeholder="请选择">
             <el-option v-for="item in dutyList"
@@ -593,7 +593,7 @@
         </el-form-item>
         <el-form-item label="角色"
                       prop="newRoles">
-          <el-select v-model="peoForm.newRoles"
+          <el-select v-model.trim="peoForm.newRoles"
                      multiple
                      placeholder="请选择">
             <el-option v-for="item in roleList"
@@ -608,7 +608,7 @@
             <el-cascader class="u-item-width-normal"
                        size="small"
                        ref="myCascader"
-                       v-model="peoForm.manageScopes"
+                       v-model.trim="peoForm.manageScopes"
                        :options="orgOptions"
                        :props="orgOptionProps"
                        :show-all-levels="false"
@@ -644,37 +644,37 @@
                :before-close="handleClosePeoView" destroy-on-close>
       <el-form label-width="120px">
         <el-form-item label="姓名">
-          <el-input v-model="peoForm.name"
+          <el-input v-model.trim="peoForm.name"
                     placeholder="姓名"
                     :disabled="true"></el-input>
         </el-form-item>
         <el-form-item label="联系电话">
-          <el-input v-model="peoForm.mobile"
+          <el-input v-model.trim="peoForm.mobile"
                     placeholder="联系电话"
                     :disabled="true"></el-input>
         </el-form-item>
         <el-form-item label="证件号">
-          <el-input v-model="peoForm.idCard"
+          <el-input v-model.trim="peoForm.idCard"
                     placeholder="--"
                     :disabled="true"></el-input>
         </el-form-item>
         <el-form-item label="组织/部门">
-          <el-input v-model="peoForm.zuzhi"
+          <el-input v-model.trim="peoForm.zuzhi"
                     placeholder="组织/部门"
                     :disabled="true"></el-input>
         </el-form-item>
         <el-form-item label="激活时间">
-          <el-input v-model="peoForm.activeTime"
+          <el-input v-model.trim="peoForm.activeTime"
                     placeholder="激活时间"
                     :disabled="true"></el-input>
         </el-form-item>
         <el-form-item label="职位">
-          <el-input v-model="peoForm.duty"
+          <el-input v-model.trim="peoForm.duty"
                     placeholder="职位"
                     :disabled="true"></el-input>
         </el-form-item>
         <el-form-item label="是否禁用">
-          <el-input v-model="peoForm.disableFlag"
+          <el-input v-model.trim="peoForm.disableFlag"
                     placeholder="是否禁用"
                     :disabled="true"></el-input>
         </el-form-item>
@@ -695,13 +695,13 @@
       <el-form label-width="120px"
                :model="agencyForm">
         <el-form-item label="姓名">
-          <el-input v-model="transferForm.name"
+          <el-input v-model.trim="transferForm.name"
                     placeholder="姓名"></el-input>
         </el-form-item>
         <el-form-item label="调动至">
           <el-cascader clearable
                        :props="{ checkStrictly: true, multiple: false }"
-                       v-model="selectValue"
+                       v-model.trim="selectValue"
                        :options="options"
                        style="width: 100%"
                        @change="handleChangeTransferCascader">
@@ -719,7 +719,7 @@
                     placeholder="请输入内容"
                     maxlength="500"
                     show-word-limit
-                    v-model="transferForm.remarks">
+                    v-model.trim="transferForm.remarks">
           </el-input>
         </el-form-item>
       </el-form>
@@ -738,13 +738,13 @@
                :before-close="handleClose" destroy-on-close>
       <el-form label-width="120px" :model="agencyForm" ref="agencyForm" :rules="rulesAddAgency">
         <el-form-item label="组织名称" prop="agencyName">
-          <el-input v-model="agencyForm.agencyName"
+          <el-input v-model.trim="agencyForm.agencyName"
                     placeholder="请输入组织名称"></el-input>
         </el-form-item>
 
         <!-- 组织区划 -->
         <el-form-item label="组织区划" prop="areaCode">
-          <el-select v-model="agencyForm.areaCode"
+          <el-select v-model.trim="agencyForm.areaCode"
                      placeholder="请选择组织区划"
                      @change="handelZoing">
             <el-option v-for="item in zonings"
@@ -756,15 +756,15 @@
         </el-form-item>
 
         <el-form-item label="组织编码">
-          <el-input v-model="agencyForm.code"
+          <el-input v-model.trim="agencyForm.code"
                     placeholder="请输入组织编码"></el-input>
         </el-form-item>
         <el-form-item label="负责人">
-          <el-input v-model="agencyForm.contacts"
+          <el-input v-model.trim="agencyForm.contacts"
                     placeholder="请输入负责人名字"></el-input>
         </el-form-item>
         <el-form-item label="联系电话">
-          <el-input v-model="agencyForm.mobile"
+          <el-input v-model.trim="agencyForm.mobile"
                     placeholder="请输入联系电话"></el-input>
         </el-form-item>
         <el-form-item
@@ -775,7 +775,7 @@
         >
           <div style="width: 500px">
             <el-select
-              v-model="searchValue"
+              v-model.trim="searchValue"
               filterable
               style="width: 500px"
               remote
@@ -803,7 +803,7 @@
                         show-word-limit
                         :rows="3"
                         placeholder="请输入简介，不超过500字"
-                        v-model="agencyForm.description"></el-input>
+                        v-model.trim="agencyForm.description"></el-input>
         </el-form-item>
       </el-form>
       <div slot="footer">
@@ -821,20 +821,20 @@
                :before-close="handleClose" destroy-on-close>
       <el-form label-width="120px">
         <el-form-item label="组织名称">
-          <el-input v-model="OrgDetailsForm.agencyName"
+          <el-input v-model.trim="OrgDetailsForm.agencyName"
                     placeholder="请输入组织名称"></el-input>
         </el-form-item>
 
         <el-form-item label="组织编码">
-          <el-input v-model="OrgDetailsForm.code"
+          <el-input v-model.trim="OrgDetailsForm.code"
                     placeholder="请输入组织编码"></el-input>
         </el-form-item>
         <el-form-item label="负责人">
-          <el-input v-model="OrgDetailsForm.contacts"
+          <el-input v-model.trim="OrgDetailsForm.contacts"
                     placeholder="请输入负责人名字"></el-input>
         </el-form-item>
         <el-form-item label="联系电话">
-          <el-input v-model="OrgDetailsForm.mobile"
+          <el-input v-model.trim="OrgDetailsForm.mobile"
                     placeholder="请输入联系电话"></el-input>
         </el-form-item>
         <el-form-item
@@ -845,7 +845,7 @@
         >
           <div style="width: 500px">
             <el-select
-              v-model="searchValue"
+              v-model.trim="searchValue"
               filterable
               style="width: 500px"
               remote
@@ -882,13 +882,13 @@
                :before-close="handleClose" destroy-on-close>
       <el-form label-width="120px">
         <el-form-item label="组织名称">
-          <el-input v-model="OrgDetailsForm.agencyName"
+          <el-input v-model.trim="OrgDetailsForm.agencyName"
                     placeholder="请输入组织名称"></el-input>
         </el-form-item>
 
         <!-- 组织区划 -->
         <el-form-item label="组织区划">
-          <el-select v-model="OrgDetailsForm.areaCode"
+          <el-select v-model.trim="OrgDetailsForm.areaCode"
                      placeholder="请选择组织区划"
                      @change="handelStreeOrCommunityZoing">
             <el-option v-for="item in zonings"
@@ -900,15 +900,15 @@
         </el-form-item>
 
         <el-form-item label="组织编码">
-          <el-input v-model="OrgDetailsForm.code"
+          <el-input v-model.trim="OrgDetailsForm.code"
                     placeholder="请输入组织编码"></el-input>
         </el-form-item>
         <el-form-item label="负责人">
-          <el-input v-model="OrgDetailsForm.contacts"
+          <el-input v-model.trim="OrgDetailsForm.contacts"
                     placeholder="请输入负责人名字"></el-input>
         </el-form-item>
         <el-form-item label="联系电话">
-          <el-input v-model="OrgDetailsForm.mobile"
+          <el-input v-model.trim="OrgDetailsForm.mobile"
                     placeholder="请输入联系电话"></el-input>
         </el-form-item>
         <el-form-item
@@ -919,7 +919,7 @@
         >
           <div style="width: 500px">
             <el-select
-              v-model="searchValue"
+              v-model.trim="searchValue"
               filterable
               style="width: 500px"
               remote
@@ -956,20 +956,20 @@
                :before-close="handleClose" destroy-on-close>
       <el-form label-width="120px">
         <el-form-item label="部门名称">
-          <el-input v-model="OrgUnitDetailsForm.departmentName"
+          <el-input v-model.trim="OrgUnitDetailsForm.departmentName"
                     placeholder="请输入组织名称"></el-input>
         </el-form-item>
 
         <el-form-item label="组织编码">
-          <el-input v-model="OrgUnitDetailsForm.code"
+          <el-input v-model.trim="OrgUnitDetailsForm.code"
                     placeholder="请输入组织编码"></el-input>
         </el-form-item>
         <el-form-item label="负责人">
-          <el-input v-model="OrgUnitDetailsForm.contacts"
+          <el-input v-model.trim="OrgUnitDetailsForm.contacts"
                     placeholder="请输入负责人名字"></el-input>
         </el-form-item>
         <el-form-item label="联系电话">
-          <el-input v-model="OrgUnitDetailsForm.mobile"
+          <el-input v-model.trim="OrgUnitDetailsForm.mobile"
                     placeholder="请输入联系电话"></el-input>
         </el-form-item>
       </el-form>
@@ -988,19 +988,19 @@
                :before-close="handleClose" destroy-on-close>
       <el-form label-width="120px">
         <el-form-item label="网格名称">
-          <el-input v-model="modifyGridFrom.gridName"
+          <el-input v-model.trim="modifyGridFrom.gridName"
                     placeholder="请输入组织名称"></el-input>
         </el-form-item>
 
         <el-form-item label="组织编码">
-          <el-input v-model="modifyGridFrom.code"
+          <el-input v-model.trim="modifyGridFrom.code"
                     placeholder="请输入组织编码"></el-input>
         </el-form-item>
 
         <!-- 网格类型下拉框 -->
         <el-form-item label="网格类型"
                       prop="typeTag">
-          <el-select v-model="modifyGridFrom.gridType"
+          <el-select v-model.trim="modifyGridFrom.gridType"
                      clearable
                      placeholder="网格类型">
             <el-option v-for="item in typeList"
@@ -1013,17 +1013,17 @@
 
         <!-- 排序 -->
         <el-form-item label="排序">
-          <el-input-number v-model="modifyGridFrom.gridSort"
+          <el-input-number v-model.trim="modifyGridFrom.gridSort"
                            :min="1"
                            label="排序"></el-input-number>
         </el-form-item>
 
         <el-form-item label="负责人">
-          <el-input v-model="modifyGridFrom.contacts"
+          <el-input v-model.trim="modifyGridFrom.contacts"
                     placeholder="请输入负责人名字"></el-input>
         </el-form-item>
         <el-form-item label="联系电话">
-          <el-input v-model="modifyGridFrom.mobile"
+          <el-input v-model.trim="modifyGridFrom.mobile"
                     placeholder="请输入联系电话"></el-input>
         </el-form-item>
 
@@ -1036,7 +1036,7 @@
         >
           <div style="width: 500px">
             <el-select
-              v-model="searchValue"
+              v-model.trim="searchValue"
               filterable
               style="width: 500px"
               remote
@@ -2774,6 +2774,7 @@ export default {
         contacts: this.OrgDetailsForm.contacts,
         mobile: this.OrgDetailsForm.mobile,
         code: this.OrgDetailsForm.code,
+        areaCode: this.OrgDetailsForm.areaCode,
         latitude: this.latitude,
         longitude: this.longitude,
       };
diff --git a/src/views/modules/base/resi.vue b/src/views/modules/base/resi.vue
index e91e29272..1b5048f7e 100644
--- a/src/views/modules/base/resi.vue
+++ b/src/views/modules/base/resi.vue
@@ -1,39 +1,86 @@
 <template>
-    <div class="g-main">
-        <div class="m-search">
-            <section :class="showSercahStatus
-                ? 'm-form-box-height-auto'
-                : 'm-form-box-height'
-                ">
-                <resi-search ref="myResiSearch" @handleSearchFrom="handleSearchFrom" />
-            </section>
-            <el-row class="resi-search">
-                <el-col :span="24">
-                    <el-button size="small" type="primary" @click="handleSearchFrom('search')">查询</el-button>
-                    <el-button style="margin-left: 10px" size="small" plain class="f-right5 diy-button--white"
-                        @click="resetSearchForm">重置</el-button>
-
-                    <el-button type="text" size="small" style="margin-left: 10px" class="f-right5"
-                        @click="showSercahStatus = !showSercahStatus">
-                        <i :class="showSercahStatus
-                            ? 'el-icon-arrow-up'
-                            : 'el-icon-arrow-down'
-                            "></i>
-                        {{ showSercahStatus ? "收起" : "展开" }}
-                    </el-button>
-                </el-col>
-            </el-row>
-        </div>
-
-        <div class="m-table">
-            <div class="div_btn">
-                <div class="div_btn_left">
-                    <el-button class="diy-button--add" v-if="btnAuths.ic_resi_add" size="small" @click="handleAdd"
-                        type="primary" icon="el-icon-plus">
-                        新增</el-button>
-                    <el-button v-if="btnAuths.ic_resi_export" style="margin-left: 10px" size="small"
-                        class="diy-button--white" @click="diyExport" plain>导出</el-button>
-                    <!-- <el-button v-if="btnAuths.ic_resi_export"
+  <div class="g-main">
+    <div :style="{ height: rowHeight }" class="div_tree">
+      <el-input placeholder="输入关键字进行过滤" v-model.trim="filterText" @keydown.native.enter="handleChangeSerch()">
+      </el-input>
+      <el-scrollbar :style="{ height: treeHeight }" class="scrollar">
+        <el-tree ref="ref_tree" v-loading="treeLoading" class="filter_tree" :data="treeData" :props="defaultProps"
+          :highlight-current="true" node-key="id" :expand-on-click-node="false" :filter-node-method="filterNode"
+          @node-click="handleNodeClick" lazy :auto-expand-parent="true" :default-expanded-keys="autoOpenArr"
+          :load="lazyLoadTree">
+          <div slot-scope="{ node, data }" class="custom-tree-node">
+            <!-- <img
+                    v-if="showIcons(data)"
+                    src="@/assets/images/index/abnormal.png"
+                    style="
+                        height: 14px;
+                        width: 14px;
+                        margin-right: 5px;
+                        margin-top: -3px;
+                    "
+                    /> -->
+            <!-- <span v-if="data.level==='building'&&!data.showIcon"
+                        style="padding-left:20px;">{{ '   ' }}</span> -->
+            <!-- <span v-if="data.showIcon" :id="data.id"
+                    >{{ data.label + "(" }}
+                    <span style="color: red">{{ data.showNum }}</span>
+                    <span>{{ ")" }}</span>
+                    </span> -->
+            <el-tooltip :content="tooltipTitle" :disabled="isShowTooltip" placement="top" effect="dark">
+              <span class="over-ellipsis" @mouseover="mouseOverNode($event)">
+                {{ node.label }}
+              </span>
+            </el-tooltip>
+            <!-- <span :id="data.id">{{ data.label }}</span> -->
+          </div>
+        </el-tree>
+      </el-scrollbar>
+    </div>
+    <section style="width: calc(100% - 200px)">
+      <div class="m-search">
+        <section :class="showSercahStatus ? 'm-form-box-height-auto' : 'm-form-box-height'
+      ">
+          <resi-search ref="myResiSearch" @handleSearchFrom="handleSearchFrom" />
+        </section>
+        <el-row class="resi-search">
+          <el-col :span="24">
+            <el-button size="small" type="primary" @click="handleSearchFrom('search')">查询</el-button>
+            <el-button style="margin-left: 10px" size="small" plain class="f-right5 diy-button--white"
+              @click="resetSearchForm">重置</el-button>
+
+            <el-button type="text" size="small" style="margin-left: 10px" class="f-right5"
+              @click="showSercahStatus = !showSercahStatus">
+              <i :class="showSercahStatus ? 'el-icon-arrow-up' : 'el-icon-arrow-down'
+      "></i>
+              {{ showSercahStatus ? "收起" : "展开" }}
+            </el-button>
+          </el-col>
+        </el-row>
+      </div>
+      <div class="m-table">
+        <div class="div_btn">
+          <div class="div_btn_left">
+            <el-button
+              class="diy-button--add"
+              v-if="btnAuths.ic_resi_add"
+              size="small"
+              @click="handleAdd"
+              type="primary"
+              icon="el-icon-plus"
+            >
+              新增</el-button
+            >
+            <el-button
+              v-if="btnAuths.ic_resi_export"
+              style="margin-left: 10px"
+              size="small"
+              class="diy-button--white"
+              @click="handleExport"
+              :loading="exportLoading"
+              plain
+              >{{exportBtnTitle}}</el-button
+            >
+            <!-- <el-button v-if="btnAuths.ic_resi_export"
                      style="margin-left: 10px"
                      size="small"
                      class="diy-button--add"
@@ -41,7 +88,7 @@
                      type="parimary"
                      plain>核对</el-button> -->
 
-                    <!-- <el-button v-if="
+            <!-- <el-button v-if="
 							btnAuths.ic_resi_smart_import && displayedBaobiaoBtn
 						"
                      style="margin-left: 10px"
@@ -49,289 +96,161 @@
                      @click="reportForm"
                      class="diy-button--white">核对</el-button> -->
 
-                    <el-button style="margin-left: 10px" v-if="btnAuths.ic_resi_batch_del" size="small"
-                        class="diy-button--add" type="parimary" @click="deleteBatch">批量删除</el-button>
-                    <!-- <el-button type="primary" size="small">下载人口模板</el-button> -->
-                </div>
-            </div>
-
-            <el-table ref="ref_table" class="m-table-item" :data="tableData" v-loading="tableLoading" border
-                style="width: 100%" :height="tableHeight" @select-all="selectAll" @selection-change="selectionChange">
-                <!-- :selectable="checkSelectable" -->
-                <el-table-column type="selection" fixed="left" align="center" width="50" />
-                <el-table-column label="序号" type="index" fixed="left" align="left" width="50">
-                </el-table-column>
-                <el-table-column v-for="item in tableHeader" :key="item.columnName" :prop="item.columnName"
-                    :label="item.label" align="left" :show-overflow-tooltip="true" :width="item.width || ''">
-                    <template slot-scope="scope">
-                        <a v-if="item.columnName == 'NAME' &&
-                            btnAuths.ic_resi_view
-                            " class="name-a">
-                            {{ handleFilterSpan(scope.row, item) }}
-                        </a>
-                        <div v-else-if="item.columnName == 'gender'">
-                            {{ scope.row.gender == null ? '--':scope.row.gender == 1?'男':scope.row.gender ==2?'女':'--' }}
-                        </div>
-                        <div v-else-if="item.columnName == 'birthday'">
-                            {{
-                                scope.row.birthday
-                                ? scope.row.birthday.substr(0, 10)
-                                : ""
-                            }}
-                        </div>
-                        <div v-else-if="item.columnName == 'idNum'">
-                            {{
-                                scope.row.idNum
-                                ? `${scope.row.idNum.substr(0, 11)}` +
-                                "******" +
-                                `${scope.row.idNum.substr(16, 2)}`
-                                : "--"
-                            }}
-                        </div>
-                        <div v-else-if="item.columnName == 'mobile'">
-                            {{
-                                scope.row.mobile
-                                ? `${scope.row.mobile.substr(0, 3)}` +
-                                "******" +
-                                `${scope.row.mobile.substr(7, 4)}`
-                                : "--"
-                            }}
-                        </div>
-                        <div v-else-if="item.columnName == 'categoryInfo'">
-                            <template v-if="scope.row.categoryInfo">
-                                <div class="resiCategoryInfoBox">
-                                    {{
-                                        scope.row.categoryInfo.specialSupportFlag ==
-                                        1
-                                        ? "特扶人员 "
-                                        : ""
-                                    }}
-                                    {{
-                                        scope.row.categoryInfo.chronicDiseaseFlag ==
-                                        1
-                                        ? "慢病 "
-                                        : ""
-                                    }}
-                                    {{
-                                        scope.row.categoryInfo.dementedFlag == 1
-                                        ? "失智老人 "
-                                        : ""
-                                    }}
-                                    {{
-                                        scope.row.categoryInfo.disabilityFlag == 1
-                                        ? "残疾 "
-                                        : ""
-                                    }}
-                                    {{
-                                        scope.row.categoryInfo.disabledFlag == 1
-                                        ? "失能老人 "
-                                        : ""
-                                    }}
-                                    {{
-                                        scope.row.categoryInfo.emptyNesterFlag == 1
-                                        ? "空巢老人 "
-                                        : ""
-                                    }}
-                                    {{
-                                        scope.row.categoryInfo.ensureHouseFlag == 1
-                                        ? "保障房人员 "
-                                        : ""
-                                    }}
-                                    {{
-                                        scope.row.categoryInfo.fertileWomanFlag == 1
-                                        ? "育龄妇女 "
-                                        : ""
-                                    }}
-                                    {{
-                                        scope.row.categoryInfo.floatingFlag == 1
-                                        ? "流动人口 "
-                                        : ""
-                                    }}
-                                    {{
-                                        scope.row.categoryInfo.liveAloneFlag == 1
-                                        ? "独居老人 "
-                                        : ""
-                                    }}
-                                    {{
-                                        scope.row.categoryInfo.oldPeopleFlag == 1
-                                        ? "老年人 "
-                                        : ""
-                                    }}
-                                    {{
-                                        scope.row.categoryInfo.partyFlag == 1
-                                        ? "党员 "
-                                        : ""
-                                    }}
-                                    {{
-                                        scope.row.categoryInfo
-                                            .petitionOfficerFlag == 1
-                                        ? "信访人员 "
-                                        : ""
-                                    }}
-                                    {{
-                                        scope.row.categoryInfo.seriousIllnessFlag ==
-                                        1
-                                        ? "大病 "
-                                        : ""
-                                    }}
-                                    {{
-                                        scope.row.categoryInfo.specialCrowdFlag == 1
-                                        ? "特殊人群 "
-                                        : ""
-                                    }}
-                                    {{
-                                        scope.row.categoryInfo
-                                            .subsistenceAllowanceFlag == 1
-                                        ? "低保人员 "
-                                        : ""
-                                    }}
-                                    {{
-                                        scope.row.categoryInfo.tenantFlag == 1
-                                        ? "租户 "
-                                        : ""
-                                    }}
-                                    {{
-                                        scope.row.categoryInfo.unemployedFlag == 1
-                                        ? "失业 "
-                                        : ""
-                                    }}
-                                    {{
-                                        scope.row.categoryInfo.unitedFrontFlag == 1
-                                        ? "统战人员 "
-                                        : ""
-                                    }}
-                                    {{
-                                        scope.row.categoryInfo.veteranFlag == 1
-                                        ? "退役军人 "
-                                        : ""
-                                    }}
-                                    {{
-                                        scope.row.categoryInfo.volunteerFlag == 1
-                                        ? "志愿者 "
-                                        : ""
-                                    }}
-                                    {{
-                                        scope.row.categoryInfo.publicWelfareFlag == 1
-                                        ? "公益岗 "
-                                        : ""
-                                    }}
-                                    {{
-                                        scope.row.categoryInfo.buildingChiefFlag == 1
-                                        ? "楼长 "
-                                        : ""
-                                    }}
-                                    {{
-                                        scope.row.categoryInfo.unitChiefFlag == 1
-                                        ? "单元长 "
-                                        : ""
-                                    }}
-                                </div>
-                            </template>
-                        </div>
-                        <span v-else>{{
-                            handleFilterSpan(scope.row, item)
-                        }}</span>
-                    </template>
-                </el-table-column>
-                <el-table-column fixed="right" label="操作" align="center" width="200">
-                    <template slot-scope="scope">
-                        <el-button v-if="btnAuths.ic_resi_view" type="text" size="small"
-                            @click="handleLook(scope.row)">查看</el-button>
-
-                        <template v-if="filterEdit(scope.row.agencyId)">
-                            <el-button v-if="btnAuths.ic_resi_update" style="margin-right: 10px"
-                                @click="handleEdit(scope.row)" size="small" type="text">编辑</el-button>
-
-                            <el-popconfirm v-if="btnAuths.ic_resi_del" title="删除之后无法回复，确认删除？"
-                                @onConfirm="handleDel(scope.row)">
-                                <el-button size="small" type="text" slot="reference">删除</el-button>
-                            </el-popconfirm>
-
-                            <el-dropdown trigger="click" style="margin-left: 10px" @command="(command) =>
-                                handelRegister(command, scope.row)
-                                ">
-                                <el-button class="div-table-button--blue" size="small" type="text" style="font-size: 10px">
-                                    ▪▪▪</el-button>
-                                <el-dropdown-menu slot="dropdown">
-                                    <el-dropdown-item v-if="false && btnAuths.ic_resi_change_rec
-                                        " command="bgjl">变更记录</el-dropdown-item>
-                                    <el-dropdown-item v-if="btnAuths.ic_resi_update" command="swdj">死亡登记</el-dropdown-item>
-                                    <el-dropdown-item v-if="btnAuths.ic_resi_update" command="qcdj">迁出登记</el-dropdown-item>
-                                </el-dropdown-menu>
-                            </el-dropdown>
-                        </template>
-                    </template>
-                </el-table-column>
-            </el-table>
-
-            <div class="div-flex">
-                <div class="m-page">
-                    <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange"
-                        :current-page.sync="currentPage" :page-sizes="[20, 50, 100, 200]" :page-size="pageSize"
-                        layout="sizes, prev, pager, next, total" :total="total">
-                    </el-pagination>
-                </div>
-            </div>
+            <el-button style="margin-left: 10px" v-if="btnAuths.ic_resi_batch_del" size="small" class="diy-button--add"
+              type="parimary" @click="deleteBatch">批量删除</el-button>
+            <!-- <el-button type="primary" size="small">下载人口模板</el-button> -->
+          </div>
         </div>
 
-        <el-dialog :title="formName === '社区居民基本信息录入表' ? '新增居民' : formName
-            " :visible.sync="dialogVisible" width="1135px" top="5vh" append-to-body class="dialog-h"
-            :close-on-click-modal="false" :before-close="handlerCancle">
-            <div class="dialog-h-content scroll-h">
-                <resi-form v-if="dialogVisible" ref="baseForm" :formType="formType" :fixed="true" :resi-id="editUserId"
-                    @changegroup="handleChangeGroup" />
-            </div>
-
-            <div class="resi-btns">
-                <el-button size="small" v-if="false" @click="handlerReset" class="diy-button--common">重置</el-button>
-                <el-button size="small" class="diy-button--white" @click="handlerCancle" plain>取消</el-button>
-                <el-button v-if="!editUserId" type="primary" size="small" :loading="btnLoading"
-                    @click="handleSUbmit">保存</el-button>
-
-                <el-button v-else type="primary" size="small" :loading="btnLoading" @click="handleEditSUbmit">提交</el-button>
-            </div>
-        </el-dialog>
-
-        <el-dialog title="居民详情" :visible.sync="dialogVisible2" width="1135px" top="5vh" append-to-body class="dialog-h"
-            :close-on-click-modal="false" :before-close="() => {
-                this.dialogVisible2 = false;
-            }
-                ">
-            <div class="dialog-h-content scroll-h">
-                <resi-info v-if="dialogVisible2" ref="resiInfo" :fixed="true" :resi-id="lookResiId" />
-            </div>
-
-            <div class="resi-btns">
-                <el-button size="small" class="diy-button--white" plain @click="dialogVisible2 = false">关闭</el-button>
-            </div>
-        </el-dialog>
-
-        <!-- 变更记录 -->
-        <el-dialog :visible.sync="changeRecordShow" :close-on-click-modal="false" :close-on-press-escape="false"
-            :title="'变更记录'" width="1150px" top="5vh" @closed="diaClose">
-            <resi-change-record ref="ref_changerecord"></resi-change-record>
-        </el-dialog>
-
-        <el-dialog :visible.sync="diyDialog" :close-on-click-modal="false" :close-on-press-escape="false" width="1150px"
-            top="5vh" class="dialog-h">
-            <diy-info v-if="diyDialog" ref="ref_diy" :list="exportList" :search="searchForm"
-                @close="handleDiyClose"></diy-info>
-        </el-dialog>
-
-        <baobiao ref="baobiao" />
-
-        <!-- 迁出登记 -->
-        <el-dialog :visible.sync="tranferShow" :close-on-click-modal="false" :close-on-press-escape="false" :title="'迁出登记'"
-            width="562px" top="5vh" class="dialog-h" @closed="diaClose">
-            <resi-change-transfer ref="ref_change_transfer" @dialogCancle="transferClose"></resi-change-transfer>
-        </el-dialog>
-
-        <!-- 死亡登记 -->
-        <el-dialog :visible.sync="deathShow" :close-on-click-modal="false" :close-on-press-escape="false" :title="'死亡登记'"
-            width="620px" top="5vh" class="dialog-h" @closed="diaClose">
-            <resideath-add ref="ref_death" @dialogCancle="deathClose"></resideath-add>
-        </el-dialog>
-    </div>
+        <el-table ref="ref_table" class="m-table-item" :data="tableData" v-loading="tableLoading" border
+          style="width: 100%" :height="tableHeight" @select-all="selectAll" @selection-change="selectionChange">
+          <!-- :selectable="checkSelectable" -->
+          <el-table-column type="selection" fixed="left" align="center" width="50" />
+          <el-table-column label="序号" type="index" fixed="left" align="left" width="50">
+          </el-table-column>
+
+
+          <el-table-column v-for="item in tableHeader" :key="item.columnName" :prop="item.columnName"
+            :label="item.label" align="left" :show-overflow-tooltip="true" :width="item.width || ''">
+            <template slot-scope="scope">
+              <a v-if="item.columnName == 'NAME' && btnAuths.ic_resi_view" class="name-a">
+                {{ handleFilterSpan(scope.row, item) }}
+              </a>
+              <div v-else-if="item.columnName == 'gender'">
+                {{
+      scope.row.gender == null
+        ? "--"
+        : scope.row.gender == 1
+          ? "男"
+          : scope.row.gender == 2
+            ? "女"
+            : "--"
+    }}
+              </div>
+
+
+              <div v-else-if="item.columnName == 'synthesizeScore'">
+                {{
+                  scope.row.synthesizeScore
+                }}
+              </div>
+
+
+
+
+              <div v-else-if="item.columnName == 'gridName'">
+                <template>
+                  <div class="resiCategoryInfoBox">
+                    {{ scope.row.agencyName + scope.row.homeName }}
+                  </div>
+                </template>
+              </div>
+              <div v-else-if="item.columnName == 'categoryNames'">
+                <template v-if="scope.row.categoryInfo">
+                  <div class="resiCategoryInfoBox">
+                    {{ scope.row.categoryInfo.categoryNames }}
+                  </div>
+                </template>
+              </div>
+              <div v-else-if="item.columnName == 'householdSituationName'">
+                <template v-if="scope.row.home">
+                  <div>
+                    {{ scope.row.home.householdSituationName || "" }}
+                  </div>
+                </template>
+              </div>
+              <div v-else-if="item.columnName == 'resiHouseRel'">
+                <template v-if="scope.row.home">
+                  <div>
+                    {{
+      scope.row.home.resiHouseRel != null
+        ? scope.row.home.resiHouseRel == 0
+          ? "自住"
+          : scope.row.home.resiHouseRel == 1
+            ? "租住"
+            : ""
+        : ""
+    }}
+                  </div>
+                </template>
+              </div>
+              <span v-else>{{ handleFilterSpan(scope.row, item) }}</span>
+            </template>
+          </el-table-column>
+
+
+
+          <el-table-column fixed="right" label="操作" align="center" width="200">
+            <template slot-scope="scope">
+              <el-button v-if="btnAuths.ic_resi_view" type="text" size="small"
+                @click="handleLook(scope.row)">查看</el-button>
+
+              <template v-if="filterEdit(scope.row.agencyId)">
+                <el-button v-if="btnAuths.ic_resi_update" style="margin-right: 10px"
+                  @click="handelCLickShowCheckPassword(scope.row)" size="small" type="text">编辑</el-button>
+
+                <el-popconfirm v-if="btnAuths.ic_resi_del" title="删除之后无法回复，确认删除？" @onConfirm="handleDel(scope.row)">
+                  <el-button size="small" type="text" slot="reference">删除</el-button>
+                </el-popconfirm>
+
+                <el-dropdown trigger="click" style="margin-left: 10px"
+                  @command="(command) => handelRegister(command, scope.row)">
+                  <el-button class="div-table-button--blue" size="small" type="text" style="font-size: 10px">
+                    ▪▪▪</el-button>
+                  <el-dropdown-menu slot="dropdown">
+                    <el-dropdown-item v-if="false && btnAuths.ic_resi_change_rec" command="bgjl">变更记录</el-dropdown-item>
+                    <el-dropdown-item v-if="btnAuths.ic_resi_update" command="swdj">死亡登记</el-dropdown-item>
+                    <el-dropdown-item v-if="btnAuths.ic_resi_update" command="qcdj">迁出登记</el-dropdown-item>
+                  </el-dropdown-menu>
+                </el-dropdown>
+              </template>
+            </template>
+          </el-table-column>
+        </el-table>
+
+        <div class="div-flex">
+          <div class="m-page">
+            <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange"
+              :current-page.sync="currentPage" :page-sizes="[20, 50, 100, 200]" :page-size="pageSize"
+              layout="sizes, prev, pager, next, total" :total="total">
+            </el-pagination>
+          </div>
+        </div>
+      </div>
+    </section>
+    <!-- 变更记录 -->
+    <el-dialog :visible.sync="changeRecordShow" :close-on-click-modal="false" :close-on-press-escape="false"
+      :title="'变更记录'" width="1150px" top="5vh" @closed="diaClose">
+      <resi-change-record ref="ref_changerecord"></resi-change-record>
+    </el-dialog>
+
+
+    <baobiao ref="baobiao" />
+
+    <!-- 迁出登记 -->
+    <el-dialog :visible.sync="tranferShow" :close-on-click-modal="false" :close-on-press-escape="false" :title="'迁出登记'"
+      width="562px" top="5vh" class="dialog-h" @closed="diaClose">
+      <resi-change-transfer ref="ref_change_transfer" @dialogCancle="transferClose"></resi-change-transfer>
+    </el-dialog>
+
+    <!-- 死亡登记 -->
+    <el-dialog :visible.sync="deathShow" :close-on-click-modal="false" :close-on-press-escape="false" :title="'死亡登记'"
+      width="620px" top="5vh" class="dialog-h" @closed="diaClose">
+      <resideath-add ref="ref_death" @dialogCancle="deathClose"></resideath-add>
+    </el-dialog>
+    <el-dialog title="密码验证" :visible.sync="showCheckPassword">
+      <el-form :model="checkPasswordFrom" :rules="checkPasswordRulse" ref="checkPasswordFrom">
+        <el-form-item label="密码" prop="password">
+          <el-input v-model.trim="checkPasswordFrom.password" autocomplete="off" type="password" placeholder="请输入当前账号密码"
+            @keydown.native.enter="handelClickCheckPassword"></el-input>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="showCheckPassword = false">取 消</el-button>
+        <el-button type="primary" @click="handelClickCheckPassword">确 定</el-button>
+      </div>
+    </el-dialog>
+  </div>
 </template>
 
 <script>
@@ -345,927 +264,962 @@ import resiTransfer from "../../components/resiTransfer.vue";
 import resiChangeRecord from "../../components/resiChangeRecord.vue";
 
 import baobiao from "@/views/modules/cpts/baobiao";
-import diyInfo from "./diyInfo.vue";
-import { requestPost } from "@/js/dai/request";
+import { requestPost, requestGet } from "@/js/dai/request";
+import { Loading } from "element-ui"; // 引入Loading服务
 
 import resiChangeTransfer from "../../components/resiChangeTransfer.vue";
 import resideathAdd from "../plugins/change/resideathAdd.vue";
-
+let loading;
 export default {
-    components: {
-        baobiao,
-        resiSearch,
-        resiForm,
-        resiInfo,
-        resiTransfer,
-        resiChangeRecord,
-        diyInfo,
-        resiChangeTransfer,
-        resideathAdd,
+  components: {
+    baobiao,
+    resiSearch,
+    resiForm,
+    resiInfo,
+    resiTransfer,
+    resiChangeRecord,
+    resiChangeTransfer,
+    resideathAdd,
+  },
+  data() {
+    return {
+      showSercahStatus: false,
+      exportLoading:false,
+      exportBtn: false,
+      exportBtnTitle: "导出",
+      importBtnTitle: "导入",
+      importLoading: false,
+      tableLoading: false,
+      btnLoading: false,
+      disabled: false,
+      selAllFlag: false,
+      selAllFlagDisabled: false,
+      isIndeterminate: false,
+      dialogEditVisible: false,
+      showCheckPassword: false,
+      checkPasswordFrom: {
+        password: "",
+      },
+      checkPasswordRulse: {
+        password: [
+          { required: true, message: "请输入密码", trigger: "blur" },
+          {
+            min: 6,
+            max: 18,
+            message: "长度在 6 到 18 个字符",
+            trigger: "blur",
+          },
+        ],
+      },
+      formType: "add",
+      // 显示人员详情
+      lookResiId: "",
+
+      uploadUlr:
+        window.SITE_CONFIG["apiURL"] + "/epmetuser/icresiuser/importExcel",
+      currentPage: 1,
+      pageSize: 20,
+      total: null,
+      conditions: [],
+      activeName: "",
+      tableData: [],
+      tableDataTow: [],
+      valueb: '',
+      searchList: [],
+
+      treeData: [],
+      autoOpenArr: [],
+      selTreeObj: {},
+      treeLoading: false,
+      filterText: "",
+      searchAgencyObj: {
+        buildId: null,
+        villageId: null,
+        gridId: null,
+        agencyId: null,
+      },
+
+      defaultProps: {
+        children: "children",
+        label: "showName",
+        isLeaf: "isLeaf",
+      },
+      treeIsOk: true, //树点击是否加载完成
+
+      editTableName: {},
+      formName: "",
+      tableHeader: [
+        { columnName: "gridName", label: "地址", width: 180 },
+        // { columnName: "homeName", label: "所属房屋", width: 150 },
+        { columnName: "doorName", label: "门牌号", width: 80 },
+        { columnName: "name", label: "姓名", width: 80 },
+        { columnName: "gender", label: "性别", width: 50 },
+        // { columnName: "agencyName", label: "所属组织", width: 150 },
+        { columnName: "idTypeName", label: "证件类型", width: 80 },
+        { columnName: "idNum", label: "证件号", width: 170 },
+        { columnName: "synthesizeScore", label: "信息完整度", width: 95 },
+        { columnName: "categoryNames", label: "居民分类" },
+        { columnName: "nationalityName", label: "国籍", width: 50 },
+        { columnName: "nationName", label: "民族", width: 50 },
+        { columnName: "householdSituationName", label: "人户状况", width: 100 },
+        { columnName: "careerStatusName", label: "就业状况", width: 100 },
+        { columnName: "resiHouseRel", label: "人房关系", width: 80 },
+        // { columnName: "mobile", label: "联系电话", width: 110 },
+        { columnName: "updatedTime", label: "更新时间", width: 180 },
+        { columnName: "updatedByName", label: "更新人", width: 80 },
+      ],
+      tabsList: [],
+      selection: [],
+
+      tranferShow: false,
+      deathShow: false,
+      changeRecordShow: false,
+      lookInfo: {
+        userId: "",
+        gridName: "",
+      },
+      editUserId: "",
+
+      displayedBaobiaoBtn: false,
+
+      btnAuths: {
+        ic_resi_add: true, //新增
+        ic_resi_import: true, //导入
+        ic_resi_export: true, //导出
+        ic_resi_batch_del: true, //批量删除
+        ic_resi_smart_import: true, //智能填表
+        ic_resi_del: true, //删除
+        ic_resi_view: true, //查看
+        ic_resi_update: true, //修改
+        ic_resi_change_rec: true, //变更记录
+        ic_resi_view_real_data: true, //显示脱敏信息
+      },
+
+      category: this.$route.query.category,
+      searchForm: {},
+      isShowTooltip: false,
+      tooltipTitle: null,
+    };
+  },
+
+  props: {},
+
+  computed: {
+    ...mapGetters(["clientHeight", "iframeHeight"]),
+    tableHeight() {
+      return this.$store.state.inIframe
+        ? this.clientHeight - 450 + this.iframeHeigh
+        : this.clientHeight - 450;
     },
-    data() {
-        return {
-            showSercahStatus: false,
-            diyDialog: false,
-            exportBtn: false,
-            exportBtnTitle: "导出",
-            importBtnTitle: "导入",
-            importLoading: false,
-            tableLoading: false,
-            btnLoading: false,
-            disabled: false,
-            selAllFlag: false,
-            selAllFlagDisabled: false,
-            isIndeterminate: false,
-            dialogEditVisible: false,
-            dialogVisible: false,
-            formType: 'add',
-            // 显示人员详情
-            dialogVisible2: false,
-            lookResiId: "",
-
-            uploadUlr:
-                window.SITE_CONFIG["apiURL"] +
-                "/epmetuser/icresiuser/importExcel",
-            currentPage: 1,
-            pageSize:window.localStorage.getItem('pageSize') || 20,
-            total: null,
-            conditions: [],
-            activeName: "",
-            tableData: [],
-            searchList: [],
-            exportList: [],
-
-            editTableName: {},
-            formName: "",
-            tableHeader: [
-                { columnName: "name", label: "姓名", width: 80 },
-                { columnName: "birthday", label: "生日", width: 100 },
-                { columnName: "gender", label: "性别", width: 50 },
-                { columnName: "nationalityName", label: "国籍", width: 50 },
-                { columnName: "agencyName", label: "所属组织", width: 150 },
-                { columnName: "gridName", label: "所属网格", width: 150 },
-                { columnName: "homeName", label: "所属房屋", width: 150 },
-                { columnName: "idTypeName", label: "证件类型", width: 80 },
-                { columnName: "idNum", label: "证件号", width: 170 },
-                { columnName: "categoryInfo", label: "居民分类" },
-                { columnName: "mobile", label: "联系电话", width: 110 },
-            ],
-            tabsList: [],
-            selection: [],
-
-
-            tranferShow: false,
-            deathShow: false,
-            changeRecordShow: false,
-            lookInfo: {
-                userId: "",
-                gridName: "",
-            },
-            editUserId: "",
-
-            displayedBaobiaoBtn: false,
-
-            btnAuths: {
-                ic_resi_add: true, //新增
-                ic_resi_import: true, //导入
-                ic_resi_export: true, //导出
-                ic_resi_batch_del: true, //批量删除
-                ic_resi_smart_import: true, //智能填表
-                ic_resi_del: true, //删除
-                ic_resi_view: true, //查看
-                ic_resi_update: true, //修改
-                ic_resi_change_rec: true, //变更记录
-                ic_resi_view_real_data: true, //显示脱敏信息
-            },
-
-            category: this.$route.query.category,
-            searchForm: {},
-        };
+    treeHeight() {
+      return this.$store.state.inIframe
+        ? this.clientHeight - 245 + this.iframeHeight + "px"
+        : this.clientHeight - 245 + "px";
     },
-
-    props: {},
-
-
-    computed: {
-        ...mapGetters(["clientHeight", "iframeHeight"]),
-        tableHeight() {
-            return this.$store.state.inIframe
-                ? this.clientHeight - 450 + this.iframeHeigh
-                : this.clientHeight - 450;
-        },
+    rowHeight() {
+      return this.$store.state.inIframe
+        ? this.clientHeight - 140 + this.iframeHeight + "px"
+        : this.clientHeight - 140 + "px";
     },
-
-    async created() {
-        this.updateBtnAuths();
-        console.log("storeoooo----0000", this.$store);
+  },
+
+  async created() {
+    this.updateBtnAuths();
+  },
+
+  async mounted() {
+    this.searchH = this.$refs.myResiSearch.offsetHeight;
+    await this.loadTree();
+    if (this.treeData.length > 0) {
+      this.$nextTick(() => {
+        // ref_tree 元素的ref   value 绑定的node-key
+        this.$refs.ref_tree.setCurrentKey(this.treeData[0].id);
+      });
+    }
+    this.displayedBaobiaoBtn = await this.$refs.baobiao.existsTemplate({
+      elseParams: {
+        categoryKeys: ["resi_info"],
+        categoryKey: "resi_info",
+      },
+    });
+    // this.handleSearchFrom();
+  },
+  activated() {
+    // this.handleSearchFrom();
+  },
+  methods: {
+    mouseOverNode(event) {
+      var target = event.target;
+      let textLength = target.clientWidth;
+      let containerLength = target.scrollWidth;
+      console.log(textLength, containerLength);
+      if (textLength < containerLength) {
+        this.tooltipTitle = event.target.innerText;
+        this.isShowTooltip = false;
+      } else {
+        this.isShowTooltip = true;
+      }
     },
-
-    async mounted() {
-        this.searchH = this.$refs.myResiSearch.offsetHeight;
-        this.displayedBaobiaoBtn = await this.$refs.baobiao.existsTemplate({
-            elseParams: {
-                categoryKeys: ["resi_info"],
-                categoryKey: "resi_info",
-            },
+    // 更新按钮权限
+    updateBtnAuths() {
+      let rot = this.$route;
+      if (Array.isArray(rot.meta.btns)) {
+        rot.meta.btns.forEach((item) => {
+          this.btnAuths[item.permissions] = true;
         });
-        this.handleSearchFrom()
+      }
     },
-
-    methods: {
-        // 更新按钮权限
-        updateBtnAuths() {
-            let rot = this.$route;
-            if (Array.isArray(rot.meta.btns)) {
-                rot.meta.btns.forEach((item) => {
-                    this.btnAuths[item.permissions] = true;
-                });
-            }
-        },
-        handelRegister(command, row) {
-            console.log(command);
-            console.log(row);
-            if (command == "bgjl") {
-                this.handleChangeRecord(row);
-            } else if (command == "swdj") {
-                this.handleDeath(row);
-            } else if (command == "qcdj") {
-                this.handleChangeTransfer(row);
-            }
-        },
-        reportForm() {
-            this.$refs.baobiao.init({
-                elseParams: {
-                    categoryKeys: ["resi_info"],
-                    categoryKey: "resi_info",
-                    paramMap: {
-                        searchForm: {
-                            formCode: "resident_base_info",
-                            pageNo: this.currentPage,
-                            pageSize: this.pageSize,
-                            conditions: this.conditions,
-                        },
-                    },
-                },
-            });
-        },
-        handleSearchFrom(type) {
-            // 使用解构赋值获取需要的属性
-            const { categoryKey, agencyId, level } = this.$refs.myResiSearch.form;
-            // 深复制对象
-            let _obj = JSON.parse(JSON.stringify(this.$refs.myResiSearch.form));
-            // 处理 categoryKey
-            if (Array.isArray(categoryKey) && categoryKey.length) {
-                _obj.categoryKey = categoryKey.join(",");
-            } else {
-                _obj.categoryKey = "";
-            }
-
-            // 处理 agencyId
-            if (Array.isArray(agencyId) && agencyId.length) {
-                _obj.agencyId = agencyId[agencyId.length - 1];
-            } else {
-                _obj.agencyId = "";
-            }
-
-            _obj.level = level || '';  // 使用逻辑或操作符简化代码
-            _obj.orgType = level || '';  // 使用逻辑或操作符简化代码
-            if (type) {
-                this.currentPage = 1
-            }
-            this.getTableData(_obj);
-            this.searchForm = _obj;
-            // 还原form的值
-            this.$refs.myResiSearch.form.categoryKey = categoryKey;
-            this.$refs.myResiSearch.form.agencyId = agencyId;
-        },
-        // 居民多选是否禁止选中
-        // checkSelectable (row, index) {
-        //   return this.filterEdit(row.agencyId);
-        // },
-
-        //迁出记录
-        async handleChangeTransfer(row) {
-            this.tranferShow = true;
-            await nextTick(200);
-            this.$refs.ref_change_transfer.initForm(row);
-        },
-        //死亡记录
-        async handleDeath(row) {
-            console.log("=====", row);
-            this.deathShow = true;
-            await nextTick(200);
-            this.$refs.ref_death.initForm(row);
-        },
-
-        //变更记录
-        async handleChangeRecord(row) {
-            this.changeRecordShow = true;
-            await nextTick(200);
-            this.$refs.ref_changerecord.initForm(row);
-        },
-
-        diaClose() {
-            this.tranferShow = false;
-            this.deathShow = false;
-            this.changeRecordShow = false;
-        },
-
-        transferClose() {
-            this.tranferShow = false;
-            this.handleSearchFrom()
-        },
-        deathClose() {
-            this.deathShow = false;
-            this.handleSearchFrom()
-        },
-        handleDiyClose() {
-            this.diyDialog = false;
-        },
-
-        async diyExport() {
-            await this.getExportList();
-            console.log(this.$refs['']);
-        },
-        computedWidth(label, type) {
-            let wd = "";
-            if (type == "input" || type == "select") wd = 40 * label.length;
-            else if (type == "radio") wd = 20 * label.length;
-            console.log("type-----wd", wd);
-            return wd > 80 ? wd : 80;
-        },
-        filterEdit(id) {
-            const { user } = this.$store.state;
-            return true; //临时放开权限，正式需要注释掉
-            // return id === user.agencyId;
-        },
-        selectionChange(selection) {
-            this.selection = selection;
-            if (selection.length === this.tableData.length) {
-                this.selAllFlag = true;
-                this.isIndeterminate = false;
-            } else if (selection.length > 0) {
-                this.selAllFlag = false;
-                this.isIndeterminate = true;
-            } else {
-                this.selAllFlag = false;
-                this.isIndeterminate = false;
-            }
-        },
-        handleSelectAll(selectAllFlag) {
-            // if (this.tableData.length == 0) {
-            //   this.selAllFlag = false
-            //   return
-            // }
-            this.$refs.ref_table.clearSelection();
-            if (selectAllFlag) {
-                this.tableData.forEach((row) => {
-                    // this.$refs.ref_table.toggleRowSelection(row);
-                    if (row.isChecked) {
-                        this.$refs.ref_table.toggleRowSelection(row);
-                    }
-                });
-            }
-        },
-        selectAll(selection) {
-            this.selection = selection;
-
-            if (selection.length > 0) {
-                this.selAllFlag = true;
-            } else {
-                this.selAllFlag = false;
-            }
+    handelRegister(command, row) {
+      console.log(row);
+      if (command == "bgjl") {
+        this.handleChangeRecord(row);
+      } else if (command == "swdj") {
+        this.handleDeath(row);
+      } else if (command == "qcdj") {
+        this.handleChangeTransfer(row);
+      }
+    },
+    reportForm() {
+      this.$refs.baobiao.init({
+        elseParams: {
+          categoryKeys: ["resi_info"],
+          categoryKey: "resi_info",
+          paramMap: {
+            searchForm: {
+              formCode: "resident_base_info",
+              pageNo: this.currentPage,
+              pageSize: this.pageSize,
+              conditions: this.conditions,
+            },
+          },
         },
+      });
+    },
+    handleSearchFrom(type) {
+      // console.log("this.$route.query.param1", this.$route.query.param1);
+      this.valueb = this.$route.query.param1;
+
+      // 使用解构赋值获取需要的属性
+      const { categoryKey, agencyId, level } = this.$refs.myResiSearch.form;
+      // 深复制对象
+      let _obj = JSON.parse(JSON.stringify(this.$refs.myResiSearch.form));
+      _obj.attentionCrowds = _obj.attentionCrowds.flat()
+      console.log('213', _obj)
+      switch (this.valueb) {
+        case '党员':
+          _obj.partyFlag = 1
+          _obj.integrityScoreFrom = 0
+          _obj.integrityScoreTo = 60
+          this.getTableData(_obj);
+          break;
+        case '残疾人':
+          _obj.healthStatus.push('DISABILITY_FLAG');
+          // _obj.integrityScoreFrom = parseInt(0)
+          // _obj.integrityScoreTo = parseInt(60)
+          _obj.integrityScoreFrom = 0
+          _obj.integrityScoreTo = 60
+          this.getTableData(_obj);
+          break;
+        case '退役军人':
+          _obj.attentionCrowds.push('VETERAN_FLAG');
+          _obj.integrityScoreFrom = 0
+          _obj.integrityScoreTo = 60
+          _obj.partyFlag = 1;
+          this.getTableData(_obj);
+          break;
+        case '失业人员':
+          _obj.careerStatus = 0
+          _obj.integrityScoreFrom = 0
+          _obj.integrityScoreTo = 60
+          this.getTableData(_obj);
+          break;
+        case '低保人员':
+          _obj.attentionCrowds.push('SUBSISTENCE_ALLOW');
+          _obj.integrityScoreFrom = 0
+          _obj.integrityScoreTo = 60
+          this.getTableData(_obj);
+          break;
+        case '保障房人员':
+          _obj.attentionCrowds.push('ENSURE_HOUSE_FLAG');
+          _obj.integrityScoreFrom = 0
+          _obj.integrityScoreTo = 60
+          this.getTableData(_obj);
+          break;
+        case '特殊人员':
+          _obj.attentionCrowds.push('ENSURE_HOUSE_FLAG');
+          _obj.integrityScoreFrom = 0
+          _obj.integrityScoreTo = 60
+          this.getTableData(_obj);
+          break;
+        case '大病人员':
+          _obj.healthStatus.push('SERIOUS_ILLNESS_F');
+          _obj.integrityScoreFrom = 0
+          _obj.integrityScoreTo = 60
+          this.getTableData(_obj);
+          break;
+        case '慢病人员':
+          _obj.healthStatus.push('CHRONIC_DISEASE_F');
+          _obj.integrityScoreFrom = 0
+          _obj.integrityScoreTo = 60
+          this.getTableData(_obj);
+          break;
+        case '老年人':
+          _obj.attentionCrowds.push('OLD_PEOPLE_FLAG');
+          _obj.integrityScoreFrom = 0
+          _obj.integrityScoreTo = 60
+          this.getTableData(_obj);
+          break;
+        case '特扶人员':
+          _obj.attentionCrowds.push('SPECIAL_SUPPORT_F');
+          _obj.integrityScoreFrom = 0
+          _obj.integrityScoreTo = 60
+          this.getTableData(_obj);
+          break;
+
+        default:
+          // 处理 categoryKey
+          if (Array.isArray(categoryKey) && categoryKey.length) {
+            _obj.categoryKey = categoryKey.join(",");
+          } else {
+            _obj.categoryKey = "";
+          }
+          // 处理 agencyId
+          if (Array.isArray(agencyId) && agencyId.length) {
+            _obj.agencyId = agencyId[agencyId.length - 1];
+          } else {
+            _obj.agencyId = "";
+          }
+          _obj.level = level || "";
+          _obj.orgType = level || "";
+          _obj = { ..._obj, ...this.searchAgencyObj };
+          if (type) {
+            this.currentPage = 1;
+          }
+          console.log("this.valueb", _obj)
+          this.getTableData(_obj);
+          this.searchForm = _obj;
+          // 还原form的值
+          this.$refs.myResiSearch.form.categoryKey = categoryKey;
+          this.$refs.myResiSearch.form.agencyId = agencyId;
+      }
+      
+      // if (this.valueb == '党员') {
+      //   _obj.partyFlag = 1
+      //   this.getTableData(_obj);
+      //   // console.log("this.valueb",this.valueb)
+      // } if (this.valueb == '残疾人') {
+      //   _obj.healthStatus.push('DISABILITY_FLAG');
+      //   this.getTableData(_obj);
+      // } if (this.valueb == '退役军人') {
+      //   _obj.attentionCrowds.push('VETERAN_FLAG');
+      //   _obj.partyFlag = 1
+      //   this.getTableData(_obj);
+      // }
+      // else {
+      //   // 处理 categoryKey
+      //   if (Array.isArray(categoryKey) && categoryKey.length) {
+      //     _obj.categoryKey = categoryKey.join(",");
+      //   } else {
+      //     _obj.categoryKey = "";
+      //   }
+      //   // 处理 agencyId
+      //   if (Array.isArray(agencyId) && agencyId.length) {
+      //     _obj.agencyId = agencyId[agencyId.length - 1];
+      //   } else {
+      //     _obj.agencyId = "";
+      //   }
+      //   _obj.level = level || "";
+      //   _obj.orgType = level || "";
+      //   _obj = { ..._obj, ...this.searchAgencyObj };
+      //   if (type) {
+      //     this.currentPage = 1;
+      //   }
+      //   console.log("this.valueb", _obj)
+      //   this.getTableData(_obj);
+      //   this.searchForm = _obj;
+      //   // 还原form的值
+      //   this.$refs.myResiSearch.form.categoryKey = categoryKey;
+      //   this.$refs.myResiSearch.form.agencyId = agencyId;
+      // }
 
-        deleteBatch() {
-            if (this.selection.length > 0) {
-                this.$confirm("删除之后无法恢复，确认删除？", "提示", {
-                    confirmButtonText: "确定",
-                    cancelButtonText: "取消",
-                    type: "warning",
-                })
-                    .then(() => {
-                        this.deleteresiBatch();
-                    })
-                    .catch((err) => {
-                        if (err == "cancel") {
-                            // this.$message({
-                            //   type: "info",
-                            //   message: "已取消删除"
-                            // });
-                        }
-                    });
-            } else {
-                this.$message.warning("请先选择要删除的居民");
-            }
-        },
-        handleSizeChange(val) {
-            console.log(`每页 ${val} 条`);
-            this.pageSize = val;
-            this.handleSearchFrom()
-        },
-        handleCurrentChange(val) {
 
-            this.currentPage = val;
-            this.handleSearchFrom()
 
-        },
-        handleFilterSpan(row, item) {
-            let _val = "";
-            if (item.itemType === "radio" && item.options.length > 0) {
-                item.options.forEach((n) => {
-                    if (n.value === row[item.columnName]) _val = n.label;
-                });
-                if (row[item.columnName] == "0") return (_val = "");
-            }
+    },
+    // 居民多选是否禁止选中
+    // checkSelectable (row, index) {
+    //   return this.filterEdit(row.agencyId);
+    // },
+
+    //迁出记录
+    async handleChangeTransfer(row) {
+      this.tranferShow = true;
+      await nextTick(200);
+      this.$refs.ref_change_transfer.initForm(row);
+    },
+    //死亡记录
+    async handleDeath(row) {
+      console.log("=====", row);
+      this.deathShow = true;
+      await nextTick(200);
+      this.$refs.ref_death.initForm(row);
+    },
 
-            return _val || row[item.columnName];
-        },
+    //变更记录
+    async handleChangeRecord(row) {
+      this.changeRecordShow = true;
+      await nextTick(200);
+      this.$refs.ref_changerecord.initForm(row);
+    },
 
-        resetSearchForm() {
-            for (const n in this.$refs.myResiSearch.form) {
-                this.$refs.myResiSearch.form[n] = "";
-            }
-            this.currentPage = 1
-            this.$refs.myResiSearch.level = ''
-            this.getTableData();
-        },
-        async handleExportModule() {
-            let url = "/epmetuser/icresiuser/import/download-template";
-
-            let params = {};
-            await this.$http({
-                method: "POST",
-                url,
-                responseType: "blob",
-                data: params,
-            })
-                .then((res) => {
-                    console.log("res----dddd", res);
-                    // this.download(res.data, title + '.xls')
-                    if (res.headers["content-disposition"]) {
-                        let fileName = window.decodeURI(
-                            res.headers["content-disposition"]
-                                .split(";")[1]
-                                .split("=")[1]
-                        );
-                        console.log("filename", fileName);
-                        let blob = new Blob([res.data], {
-                            type: "application/vnd.ms-excel",
-                        });
-                        var url = window.URL.createObjectURL(blob);
-                        var aLink = document.createElement("a");
-                        aLink.style.display = "none";
-                        aLink.href = url;
-                        aLink.setAttribute("download", fileName);
-                        document.body.appendChild(aLink);
-                        aLink.click();
-                        document.body.removeChild(aLink); //下载完成移除元素
-                        window.URL.revokeObjectURL(url); //释放掉blob对象
-                    } else this.$message.error("下载失败");
-                })
-                .catch((err) => {
-                    console.log("err", err);
-                    return this.$message.error("网络错误");
-                });
-        },
-        // 下载文件
-        download(data, fileName) {
-            console.log("data", data);
-            if (!data) {
-                return;
-            }
+    diaClose() {
+      this.tranferShow = false;
+      this.deathShow = false;
+      this.changeRecordShow = false;
+    },
 
-            var csvData = new Blob([data]);
+    transferClose() {
+      this.tranferShow = false;
+      this.handleSearchFrom();
+    },
+    deathClose() {
+      this.deathShow = false;
+      this.handleSearchFrom();
+    },
 
-            if (window.navigator && window.navigator.msSaveOrOpenBlob) {
-                window.navigator.msSaveOrOpenBlob(csvData, fileName);
-            }
-            else {
-                var a = document.createElement("a");
-                document.body.appendChild(a);
-                a.style = "display: none";
-                var url = window.URL.createObjectURL(csvData);
-                a.href = url;
-                a.download = fileName;
-                a.click();
-                a.remove();
-                window.URL.revokeObjectURL(url);
-            }
-        },
-        async handleExport() {
-            this.exportBtn = true;
-            this.exportBtnTitle = "正在导出...";
-            let params = {
-                formCode: "resident_base_info",
-                conditions: this.conditions,
-            };
-
-            // .post('epmetuser/icresiuser/exportExcel', params)
-            await axios({
-                url:
-                    window.SITE_CONFIG["apiURL"] +
-                    "/epmetuser/icresiuser/exportExcel",
-                method: "post",
-                data: params,
-                responseType: "blob",
-            })
-                .then((res) => {
-                    console.log("resllll", res);
-                    let fileName = window.decodeURI(
-                        res.headers["content-disposition"]
-                            .split(";")[1]
-                            .split("=")[1]
-                    );
-                    console.log("filename", fileName);
-                    let blob = new Blob([res.data], {
-                        type: "application/vnd.ms-excel",
-                    });
-                    var url = window.URL.createObjectURL(blob);
-                    var aLink = document.createElement("a");
-                    aLink.style.display = "none";
-                    aLink.href = url;
-                    aLink.setAttribute("download", fileName);
-                    document.body.appendChild(aLink);
-                    aLink.click();
-                    document.body.removeChild(aLink); //下载完成移除元素
-                    window.URL.revokeObjectURL(url); //释放掉blob对象
-                })
-                .catch((err) => {
-                    console.log("获取导出情失败", err);
-                    this.$message.error("获取导出失败");
-                });
-            this.exportBtnTitle = "导出";
-            this.exportBtn = false;
-        },
-        // 上传大图标成功
-        handleExcelSuccess(res, file) {
-            if (res.code === 0 && res.msg === "success") {
-                console.log("resss---ppp", res);
-            } else {
-                this.$message.error(res.msg);
-            }
-        },
-        handleProgress(event, file, fileList) {
-            console.log("percentage", file.percentage);
-        },
+    computedWidth(label, type) {
+      let wd = "";
+      if (type == "input" || type == "select") wd = 40 * label.length;
+      else if (type == "radio") wd = 20 * label.length;
+      console.log("type-----wd", wd);
+      return wd > 80 ? wd : 80;
+    },
+    filterEdit(id) {
+      const { user } = this.$store.state;
+      return true; //临时放开权限，正式需要注释掉
+      // return id === user.agencyId;
+    },
+    selectionChange(selection) {
+      this.selection = selection;
+      if (selection.length === this.tableData.length) {
+        this.selAllFlag = true;
+        this.isIndeterminate = false;
+      } else if (selection.length > 0) {
+        this.selAllFlag = false;
+        this.isIndeterminate = true;
+      } else {
+        this.selAllFlag = false;
+        this.isIndeterminate = false;
+      }
+    },
+    handleSelectAll(selectAllFlag) {
+      // if (this.tableData.length == 0) {
+      //   this.selAllFlag = false
+      //   return
+      // }
+      this.$refs.ref_table.clearSelection();
+      if (selectAllFlag) {
+        this.tableData.forEach((row) => {
+          // this.$refs.ref_table.toggleRowSelection(row);
+          if (row.isChecked) {
+            this.$refs.ref_table.toggleRowSelection(row);
+          }
+        });
+      }
+    },
+    selectAll(selection) {
+      this.selection = selection;
+
+      if (selection.length > 0) {
+        this.selAllFlag = true;
+      } else {
+        this.selAllFlag = false;
+      }
+    },
 
-        beforeExcelUpload(file) {
-            console.log("file", file);
-            const isType = file.type === "application/vnd.ms-excel";
-            const isTypeComputer =
-                file.type ===
-                "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet";
-            const fileType = isType || isTypeComputer;
-            const isLt1M = file.size / 1024 / 1024 < 100;
-            if (!fileType) {
-                this.$message.error("上传文件只能是xls/xlsx格式！");
+    deleteBatch() {
+      if (this.selection.length > 0) {
+        this.$confirm("删除之后无法恢复，确认删除？", "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning",
+        })
+          .then(() => {
+            this.deleteresiBatch();
+          })
+          .catch((err) => {
+            if (err == "cancel") {
             }
+          });
+      } else {
+        this.$message.warning("请先选择要删除的居民");
+      }
+    },
+    handleSizeChange(val) {
+      console.log(`每页 ${val} 条`);
+      this.pageSize = val;
+      this.handleSearchFrom();
+    },
+    handleCurrentChange(val) {
+      this.currentPage = val;
+      this.handleSearchFrom();
+    },
+    handleFilterSpan(row, item) {
+      let _val = "";
+      if (item.itemType === "radio" && item.options.length > 0) {
+        item.options.forEach((n) => {
+          if (n.value === row[item.columnName]) _val = n.label;
+        });
+        if (row[item.columnName] == "0") return (_val = "");
+      }
+      return _val || row[item.columnName];
+    },
 
-            if (!isLt1M) {
-                this.$message.error("上传文件大小不能超过 100MB!");
-            }
-            return fileType && isLt1M;
-        },
-        async uploadHttpRequest(file) {
-            this.importLoading = true;
-            this.importBtnTitle = "正在上传中...";
-            this.$message({
-                showClose: true,
-                dangerouslyUseHTMLString: true,
-                message: "导入中，请到系统管理-<a id='clickA' style='cursor: pointer;'>导入记录</a>中查看进度",
-                duration: 3000
+    resetSearchForm() {
+      for (const n in this.$refs.myResiSearch.form) {
+        this.$refs.myResiSearch.form[n] = "";
+      }
+      this.$refs.myResiSearch.form.healthStatus = [];
+      this.$refs.myResiSearch.form.attentionCrowds = [];
+      this.$refs.myResiSearch.form.specialCategoryCodes = [];
+      this.currentPage = 1;
+      this.$refs.myResiSearch.level = "";
+      this.getTableData();
+    },
+    async handleExport() {
+      this.exportLoading = true;
+      this.exportBtnTitle = '正在导出中'
+      let url = "/actual/base/residentBaseInfo/fixedExport ";
+// 使用解构赋值获取需要的属性
+      const { categoryKey, agencyId, level } = this.$refs.myResiSearch.form;
+      // 深复制对象
+      let _obj = JSON.parse(JSON.stringify(this.$refs.myResiSearch.form));
+      // 处理 categoryKey
+      if (Array.isArray(categoryKey) && categoryKey.length) {
+        _obj.categoryKey = categoryKey.join(",");
+      } else {
+        _obj.categoryKey = "";
+      }
+
+      // 处理 agencyId
+      if (Array.isArray(agencyId) && agencyId.length) {
+        _obj.agencyId = agencyId[agencyId.length - 1];
+      } else {
+        _obj.agencyId = "";
+      }
+
+      _obj.level = level || "";
+      _obj.orgType = level || "";
+      _obj = { ..._obj, ...this.searchAgencyObj };
+      await this.$http({
+        method: "POST",
+        url,
+        responseType: "blob",
+        data: _obj,
+      })
+        .then((res) => {
+          console.log("res----dddd", res);
+          // this.download(res.data, title + '.xls')
+          if (res.headers["content-disposition"]) {
+            let fileName = window.decodeURI(
+              res.headers["content-disposition"].split(";")[1].split("=")[1]
+            );
+            console.log("filename", fileName);
+            let blob = new Blob([res.data], {
+              type: "application/vnd.ms-excel",
             });
-            let than = this
-            document.getElementById('clickA').addEventListener('click', function () {
-                than.$router.replace('/main/importRecord-index');
-            })
-            const formData = new FormData(); //FormData对象，添加参数只能通过append('key', value)的形式添加
-            formData.append("file", file.file); //添加文件对象
-            await this.$http
-                .post("/epmetuser/icresiuser/importExcel", formData)
-                .then((res) => {
-                    console.log("res-up", res);
-                    if (res.data.code == 0 && res.data.msg == "success") {
-                        // this.$message.success('导入成功')
-                        this.getTableData();
-                    } else this.$message.error(res.data.msg);
-                })
-                .catch((err) => {
-                    console.log("失败", err);
-                    file.onError(); //上传失败的文件会从文件列表中删除
-                    // this.$message.error('导入失败')
-                });
-            this.importLoading = false;
-            this.importBtnTitle = "导入";
-            this.$refs.upload.clearFiles();
-        },
-        handleClick(tab, event) {
-            console.log(tab, event);
-        },
+            var url = window.URL.createObjectURL(blob);
+            var aLink = document.createElement("a");
+            aLink.style.display = "none";
+            aLink.href = url;
+            aLink.setAttribute("download", fileName);
+            document.body.appendChild(aLink);
+            aLink.click();
+            document.body.removeChild(aLink); //下载完成移除元素
+            window.URL.revokeObjectURL(url); //释放掉blob对象
+          } else this.$message.error("下载失败");
+          this.exportLoading = false;
+          this.exportBtnTitle = '导出'
+        })
+        .catch((err) => {
+          console.log("err", err);
+          this.exportLoading = false;
+          this.exportBtnTitle = '导出'
+
+          return this.$message.error("网络错误");
+        });
+    },
+    // 下载文件
+    download(data, fileName) {
+      console.log("data", data);
+      if (!data) {
+        return;
+      }
+
+      var csvData = new Blob([data]);
+
+      if (window.navigator && window.navigator.msSaveOrOpenBlob) {
+        window.navigator.msSaveOrOpenBlob(csvData, fileName);
+      } else {
+        var a = document.createElement("a");
+        document.body.appendChild(a);
+        a.style = "display: none";
+        var url = window.URL.createObjectURL(csvData);
+        a.href = url;
+        a.download = fileName;
+        a.click();
+        a.remove();
+        window.URL.revokeObjectURL(url);
+      }
+    },
+  
+    // 上传大图标成功
+    handleExcelSuccess(res, file) {
+      if (res.code === 0 && res.msg === "success") {
+        console.log("resss---ppp", res);
+      } else {
+        this.$message.error(res.msg);
+      }
+    },
+    handleProgress(event, file, fileList) {
+      console.log("percentage", file.percentage);
+    },
 
-        // 查看
-        async handleLook(row) {
-            this.lookResiId = row.resiId;
-            // this.dialogVisible2 = true;
-            let { agencyId, gridId, gridName, gender, homeId, homeName, name, resiId } = row
-            this.$store.dispatch('saveData', { agencyId, gridId, gridName, gender, homeId, homeName, name, resiId });
-            this.$router.push({ name: 'jumin-huaxiang' });
-            this.$store.state.contentTabs = this.$store.state.contentTabs.map(item => {
-                if (item.name === "jumin-huaxiang") {
-                return {...item, title: name };
-                }
-                return item;
-            });
-        },
+    beforeExcelUpload(file) {
+      console.log("file", file);
+      const isType = file.type === "application/vnd.ms-excel";
+      const isTypeComputer =
+        file.type ===
+        "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet";
+      const fileType = isType || isTypeComputer;
+      const isLt1M = file.size / 1024 / 1024 < 100;
+      if (!fileType) {
+        this.$message.error("上传文件只能是xls/xlsx格式！");
+      }
+
+      if (!isLt1M) {
+        this.$message.error("上传文件大小不能超过 100MB!");
+      }
+      return fileType && isLt1M;
+    },
+    async uploadHttpRequest(file) {
+      this.importLoading = true;
+      this.importBtnTitle = "正在上传中...";
+      this.$message({
+        showClose: true,
+        dangerouslyUseHTMLString: true,
+        message:
+          "导入中，请到系统管理-<a id='clickA' style='cursor: pointer;'>导入记录</a>中查看进度",
+        duration: 3000,
+      });
+      let than = this;
+      document.getElementById("clickA").addEventListener("click", function () {
+        than.$router.replace("/main/importRecord-index");
+      });
+      const formData = new FormData(); //FormData对象，添加参数只能通过append('key', value)的形式添加
+      formData.append("file", file.file); //添加文件对象
+      await this.$http
+        .post("/epmetuser/icresiuser/importExcel", formData)
+        .then((res) => {
+          console.log("res-up", res);
+          if (res.data.code == 0 && res.data.msg == "success") {
+            // this.$message.success('导入成功')
+            this.getTableData();
+          } else this.$message.error(res.data.msg);
+        })
+        .catch((err) => {
+          console.log("失败", err);
+          file.onError(); //上传失败的文件会从文件列表中删除
+          // this.$message.error('导入失败')
+        });
+      this.importLoading = false;
+      this.importBtnTitle = "导入";
+      this.$refs.upload.clearFiles();
+    },
 
-        // 编辑
-        async handleEdit(row) {
+    // 查看
+    async handleLook(row) {
+      this.lookResiId = row.resiId;
+      let {
+        agencyId,
+        gridId,
+        gridName,
+        gender,
+        homeId,
+        homeName,
+        name,
+        resiId,
+      } = row;
+      this.$store.dispatch("saveData", {
+        agencyId,
+        gridId,
+        gridName,
+        gender,
+        homeId,
+        homeName,
+        name,
+        resiId,
+      });
+      this.$router.push({ name: "jumin-huaxiang" });
+      this.$store.state.contentTabs = this.$store.state.contentTabs.map(
+        (item) => {
+          if (item.name === "jumin-huaxiang") {
+            return { ...item, title: name };
+          }
+          return item;
+        }
+      );
+    },
+    async handelCLickShowCheckPassword(row) {
+      const url = `/actual/base/residentCategoryUpdateInfo/isUpdater/${row.resiId}`;
+      const { data, code, msg } = await requestPost(url);
+      if(code==0){
+          if(data==true){
             this.editUserId = row.resiId;
-            this.formName = "编辑居民";
-            this.formType = 'edit'
-            this.dialogVisible = true;
-            await this.residentBaseInfo();
-        },
-        // 获取详情
-        residentBaseInfo() {
-            this.$http
-                .post(`/actual/base/residentBaseInfo/detail/clear/${this.editUserId}`)
-                .then(({ data: res }) => {
-                    if (res.code !== 0) {
-                        return this.$message.error(res.msg);
-                    } else {
-                        this.$refs.baseForm.old_from(res.data);
-                    }
-                })
-                .catch((err) => {
-                    return this.$message.error("网络错误");
-                });
-        },
-        handlerReset() {
-            this.$refs.baseForm.resetForm();
-        },
-
-        async handleAdd() {
-            this.formType = 'add'
-            this.formName = "新增居民";
-            this.editUserId = "";
-            this.dialogVisible = true;
-        },
-
-        async handleChangeGroup(val) {
-            console.log("changeguoprrrrr----", val);
-            let { childGroup, value, partyInfo } = val;
-            let hasT = false;
-            let i = 0;
-            let list = [...this.tabsList];
-            list.forEach((item, index) => {
-                if (item.tableName === childGroup.tableName) {
-                    hasT = true;
-                    i = index;
-                }
+            this.saveCheckPassword()
+          }
+          else{
+            this.editUserId = row.resiId;
+            this.showCheckPassword = true;
+          }
+      }
+      else{
+        this.$message.error(msg);
+      }
+    },
+    handelClickCheckPassword() {
+      this.$refs.checkPasswordFrom.validate((vali) => {
+        if (vali) {
+          this.saveCheckPassword(this.checkPasswordFrom.password);
+        } else {
+          return false;
+        }
+      });
+    },
+    async saveCheckPassword(password){
+      const url = `/actual/base/residentBaseInfo/getResiUserInfo/${this.editUserId}`;
+          let parm = {
+            password,
+          };
+          const { data, code, msg } = await requestPost(url, parm);
+          if (code === 0) {
+            this.showCheckPassword = false;
+            this.$router.push({
+              name: "edit-resi",
+              query: { id: this.editUserId },
+              params: { idNum: data.idNum, mobile: data.mobile, name: data.name, nationality: data.nationality },
             });
-            if (value === true || value === "true") {
-                // console.log('changegroup----999', value)
-                if (!hasT) {
-                    childGroup.itemList.forEach(async (item) => {
-                        if (item.optionSourceType === "remote") {
-                            await this.getOptionsList(
-                                item.optionSourceValue
-                            ).then((res) => {
-                                item.options = this.getTreeData(res);
-                            });
-                        }
-                    });
-                    if (
-                        partyInfo &&
-                        partyInfo.length > 0 &&
-                        childGroup.tableName == "ic_party_member"
-                    ) {
-                        list.push({ ...childGroup, formInfo: partyInfo[0] });
-                    } else list.push(childGroup);
-                }
-            } else {
-                // console.log('changegroup----000', value)
-                if (hasT) list.splice(i, 1);
-            }
-            this.tabsList = [...list];
-        },
+            this.checkPasswordFrom.password = "";
+          } else {
+            this.$message.error(msg);
+          }
+    },
+     handleAdd() {
+      this.$router.push({ name: "add-resi" });
+    },
 
-        async handleEditSUbmit() {
-            this.handleSUbmit();
-        },
+    handleDel(row) {
+      console.log("row1", row);
+      this.$http
+        .post("/actual/base/residentBaseInfo/batchdel", [row.resiId])
+        .then(({ data: res }) => {
+          console.log("row2", row);
+          if (res.code !== 0) {
+            return this.$message.error(res.msg);
+          } else {
+            console.log("row3", row);
+            this.$message.success("删除成功");
+            this.getTableData();
+          }
+        })
+        .catch((err) => {
+          console.log("row4", err);
+          return this.$message.error("网络错误");
+        });
+    },
 
-        async handleSUbmit() {
-            if (!this.$refs.baseForm.submit_from()) {
-                return;
-            }
-            const _baseForm = JSON.parse(this.$refs.baseForm.submit_from());
-
-            _baseForm.partyFlag = parseInt(_baseForm.partyFlag); //党员
-            _baseForm.subsistenceAllowanceFlag = parseInt(
-                _baseForm.subsistenceAllowanceFlag
-            ); //低保
-            _baseForm.ensureHouseFlag = parseInt(_baseForm.ensureHouseFlag); //保障房
-            _baseForm.unemployedFlag = parseInt(_baseForm.unemployedFlag); //失业
-            (_baseForm.fertileWomanFlag = parseInt(_baseForm.fertileWomanFlag)), //育龄妇女
-                (_baseForm.veteranFlag = parseInt(_baseForm.veteranFlag)); //退役军人
-            _baseForm.unitedFrontFlag = parseInt(_baseForm.unitedFrontFlag); //统战人员
-            //公益岗人员
-            _baseForm.publicWelfareFlag = parseInt(
-                _baseForm.publicWelfareFlag
-            );
-            //信访人员
-            _baseForm.unemployedFlag = parseInt(_baseForm.unemployedFlag); //失业
-            _baseForm.volunteerFlag = parseInt(_baseForm.volunteerFlag); //志愿者
-            _baseForm.specialSupportFlag = parseInt(
-                _baseForm.specialSupportFlag
-            ); //特扶
-            _baseForm.tenantFlag = parseInt(_baseForm.tenantFlag); //租户
-            _baseForm.floatingFlag = parseInt(_baseForm.floatingFlag); //流动人口
-            _baseForm.specialCrowdFlag = parseInt(_baseForm.specialCrowdFlag); //特殊人群
-            _baseForm.oldPeopleFlag = parseInt(_baseForm.oldPeopleFlag); //老年人
-            _baseForm.emptyNesterFlag = parseInt(_baseForm.emptyNesterFlag); //空巢
-            _baseForm.liveAloneFlag = parseInt(_baseForm.liveAloneFlag); //独居老人
-            _baseForm.disabledFlag = parseInt(_baseForm.disabledFlag); //失能老人
-            _baseForm.dementedFlag = parseInt(_baseForm.dementedFlag); //失智老人
-            _baseForm.disabilityFlag = parseInt(_baseForm.disabilityFlag); //是否残疾
-
-            _baseForm.buildingChiefFlag = parseInt(_baseForm.buildingChiefFlag); //是否楼长
-            _baseForm.unitChiefFlag = parseInt(_baseForm.unitChiefFlag); //是否单元长
-
-
-            _baseForm.seriousIllnessFlag = parseInt(
-                _baseForm.seriousIllnessFlag
-            ); //大病
-            _baseForm.chronicDiseaseFlag = parseInt(
-                _baseForm.chronicDiseaseFlag
-            ); //慢病
-            var hobbyCode = "";
-            if (_baseForm.hobbyInfoDto) {
-                if (_baseForm.hobbyInfoDto.hobbyCode.length === 0) {
-                    hobbyCode = "";
-                    _baseForm.hobbyInfoDto.hobbyCode = hobbyCode;
-                } else {
-                    _baseForm.hobbyInfoDto.hobbyCode.forEach(
-                        (element, index) => {
-                            hobbyCode =
-                                index === 0
-                                    ? element
-                                    : hobbyCode + "," + element;
-                        }
-                    );
-                    _baseForm.hobbyInfoDto.hobbyCode = hobbyCode;
-                }
-            }
+    async getTableData(obj) {
+      let params = {
+        pageNo: this.currentPage,
+        pageSize: this.pageSize,
+        ...obj,
+      };
+      this.tableLoading = true;
+      const { data } = await this.$http.post(
+        "/actual/base/residentBaseInfo/page",
+        params
+      );
+      // console.log("bubububuhbu", data)
+      this.tableLoading = false;
+      if (data.code === 0) {
+        this.total = data.data.total;
+        this.tableData = data.data.list;
+        // console.log("呃呃呃呃", this.tableDataTow)
+      } else {
+        this.$message.error(data.msg);
+      }
+    },
 
-            var chronicDiseaseCode = "";
-            if (_baseForm.healthDto) {
-                if (_baseForm.healthDto.chronicDiseaseCode.length === 0) {
-                    chronicDiseaseCode = "";
-                    _baseForm.healthDto.chronicDiseaseCode = chronicDiseaseCode;
-                } else {
-                    _baseForm.healthDto.chronicDiseaseCode.forEach(
-                        (element, index) => {
-                            chronicDiseaseCode =
-                                index === 0
-                                    ? element
-                                    : chronicDiseaseCode + "," + element;
-                        }
-                    );
-                    _baseForm.healthDto.chronicDiseaseCode = chronicDiseaseCode;
-                }
-            }
+    async getOptionsList(url) {
+      let options = [];
+      // console.log('getOptionsList----', url)
+      await this.$http
+        .post(url, { formCode: "resident_base_info" })
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg);
+          } else {
+            options = res.data;
+          }
+        })
+        .catch(() => {
+          return this.$message.error("网络错误");
+        });
+      return options;
+    },
 
-            var volunteerCategory = "";
-            if (_baseForm.volunteerDto) {
-                if (_baseForm.volunteerDto.volunteerCategory.length === 0) {
-                    volunteerCategory = "";
-                    _baseForm.volunteerDto.volunteerCategory =
-                        volunteerCategory;
-                } else {
-                    _baseForm.volunteerDto.volunteerCategory.forEach(
-                        (element, index) => {
-                            volunteerCategory =
-                                index === 0
-                                    ? element
-                                    : volunteerCategory + "," + element;
-                        }
-                    );
-                    _baseForm.volunteerDto.volunteerCategory =
-                        volunteerCategory;
-                }
-            }
 
-            var specialCategoryCode = "";
-            if (_baseForm.specialDto) {
-                if (_baseForm.specialDto.specialCategoryCode.length === 0) {
-                    specialCategoryCode = "";
-                    _baseForm.specialDto.specialCategoryCode =
-                        specialCategoryCode;
-                } else {
-                    _baseForm.specialDto.specialCategoryCode.forEach(
-                        (element, index) => {
-                            specialCategoryCode =
-                                index === 0
-                                    ? element
-                                    : specialCategoryCode + "," + element;
-                        }
-                    );
-                    _baseForm.specialDto.specialCategoryCode =
-                        specialCategoryCode;
-                }
-            }
-            console.log('居民信息提交表单：', _baseForm);
-            this.submitAdd(_baseForm);
-        },
-        handleDel(row) {
-            console.log("row1", row);
-            this.$http
-                .post("/actual/base/residentBaseInfo/batchdel", [row.resiId])
-                .then(({ data: res }) => {
-                    console.log("row2", row);
-                    if (res.code !== 0) {
-                        return this.$message.error(res.msg);
-                    } else {
-                        console.log("row3", row);
-                        this.$message.success("删除成功");
-                        this.getTableData();
-                    }
-                })
-                .catch((err) => {
-                    console.log("row4", err);
-                    return this.$message.error("网络错误");
-                });
-        },
-        handlerCancle() {
-            this.dialogVisible = false;
-        },
-        async submitAdd(arr) {
-
-            this.btnLoading = true;
-            await this.$http
-                .post(
-                    arr.resiId
-                        ? "actual/base/residentBaseInfo/update"
-                        : "/actual/base/residentBaseInfo/save",
-                    arr
-                )
-                .then(({ data: res }) => {
-                    if (res.code !== 0) {
-                        return this.$message.error(res.msg);
-                    } else {
-                        this.$message.success("提交成功");
-                        // this.$refs[formName].resetFields();
-
-                        this.dialogVisible = false;
-                    }
-                })
-                .catch(() => {
-                    return this.$message.error("网络错误");
-                });
-            // console.log(this.$refs.baseForm.form);
-            this.btnLoading = false;
+    async deleteresiBatch() {
+      if (this.selection.length === 0)
+        return this.$message.error("请选择之后进行操作");
+      let userIds = this.selection.map((item) => item.resiId);
+      this.$http
+        .post("/actual/base/residentBaseInfo/batchdel", userIds)
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg);
+          } else {
+            this.$message.success("删除成功");
             this.handleSearchFrom();
-        },
-
-        async getTableData(obj) {
-            let params = {
-                pageNo: this.currentPage,
-                pageSize: this.pageSize,
-                ...obj,
-            };
-
-            this.tableLoading = true;
-            const { data } = await this.$http.post(
-                "/actual/base/residentBaseInfo/page",
-                params
+          }
+        })
+        .catch((err) => {
+          console.log("row4", err);
+          return this.$message.error("网络错误");
+        });
+    },
+    startLoading() {
+      loading = Loading.service({
+        lock: true, // 是否锁定
+        text: "正在加载……", // 加载中需要显示的文字
+        background: "rgba(0,0,0,.7)", // 背景颜色
+      });
+    },
+    endLoading() {
+      if (loading) {
+        loading.close();
+      }
+    },
+    async handleChangeSerch() {
+      this.startLoading();
+      this.$refs.ref_tree.$data.store.lazy = !this.filterText;
+      if (this.filterText.length > 0 && this.filterText != "") {
+        const url = `/actual/base/communityBuilding/tree/search?keyword=${this.filterText}`;
+        const { data, code, msg } = await requestGet(url);
+        if (data[0].children.length > 0) {
+          this.treeData = data;
+          for (let i in this.treeData[0].children) {
+            this.autoOpenArr.push(
+              this.treeData[0].id,
+              this.treeData[0].children[i].id,
+              this.treeData[0].children[0].children[0].id
             );
-            this.tableLoading = false;
-            if (data.code === 0) {
-                this.total = data.data.total;
-                this.tableData = data.data.list;
-            } else {
-                this.$message.error(data.msg);
-            }
-        },
-
-
-        async getOptionsList(url) {
-            let options = [];
-            // console.log('getOptionsList----', url)
-            await this.$http
-                .post(url, { formCode: "resident_base_info" })
-                .then(({ data: res }) => {
-                    if (res.code !== 0) {
-                        return this.$message.error(res.msg);
-                    } else {
-                        options = res.data;
-                    }
-                })
-                .catch(() => {
-                    return this.$message.error("网络错误");
-                });
-            return options;
-        },
-
-        getTreeData(data) {
-            if (!Array.isArray(data)) return [];
-            let arr = data.map((item) => {
-                let _item = {};
-                if (item.children) {
-                    if (item.children.length === 0)
-                        _item = { ...item, children: undefined };
-                    else
-                        _item = {
-                            ...item,
-                            children: this.getTreeData(item.children),
-                        };
-                } else {
-                    _item = { ...item };
-                }
-                return _item;
-            });
-            return arr;
-        },
-
-        async getExportList(type) {
-            const url = "/oper/customize/icformitemgroup/list";
-            let params = {
-                formCode: "resident_base_info",
-            };
-
-            const { data, code, msg } = await requestPost(url, params);
-
-            if (code === 0) {
-                data.forEach((item) => {
-                    (async (id) => {
-                        // item.queryItemList = await this.getExportChildList(id)
-                        item.queryItemList = [];
-                    })(item.id);
-                });
-                this.exportList = [...data];
-                this.$nextTick(() => {
-                    this.diyDialog = true;
-                });
-                console.log("获取详情成功getExportList----", this.exportList);
-            } else {
-                this.$message.error(msg);
-            }
-        },
-        async getExportChildList(groupId) {
-            const url = `/oper/customize/icformitem/getItemList/${groupId}`;
-            let params = {};
+          }
+        } else {
+          this.treeData = [];
+          this.$message.error("暂未找到!");
+        }
+      } else {
+        this.treeData = [];
+        this.autoOpenArr = [];
+        this.loadTree();
+      }
+      this.endLoading();
+    },
+    async lazyLoadTree(node, resolve) {
+      const url = `/actual/base/communityBuilding/tree/nextTreeNode?id=${node.data.id}&level=${node.data.level}`;
+      const { data, code, msg } = await requestGet(url);
+      if (code === 0) {
+        data.forEach((element) => {
+          if (element.level === "building") {
+            element.isLeaf = true;
+          }
+        });
+        resolve(data);
+      } else {
+        this.$message.error(msg);
+      }
+      // }
+    },
+    async loadTree(isRefresh) {
+      const url = "/actual/base/communityBuilding/tree/initTree";
+      const { data, code, msg } = await requestGet(url);
+      if (code === 0) {
+        this.treeData = [];
+        this.treeData.push(data);
+        this.autoOpenArr.push(data.id);
+        if (!isRefresh && data) {
+          this.selTreeObj = data;
 
-            const { data, code, msg } = await requestPost(url, params);
+        }
+      } else {
+        this.$message.error(msg);
+      }
+    },
+    filterNode(value, data) {
+      if (!value) return true;
+      return data.label.indexOf(value) !== -1;
+    },
+    async handleNodeClick(obj) {
+      this.selObj = JSON.parse(JSON.stringify(obj));
+      this.selTreeObj = obj;
+      await nextTick(1000);
+      this.searchAgencyObj = {};
+      if (obj.level === "building") {
+        this.searchAgencyObj.buildId = obj.id;
+        this.handleSearchFrom("type");
+      } else if (obj.level === "neighborHood") {
+        this.searchAgencyObj.villageId = obj.id;
+        this.handleSearchFrom("type");
+      } else if (obj.level == "grid") {
+        this.searchAgencyObj.gridId = obj.id;
+        this.handleSearchFrom("type");
+      } else {
+        this.searchAgencyObj.agencyId = obj.id;
+        this.handleSearchFrom("type");
+      }
+    },
 
-            if (code === 0) {
-                return data;
-            } else {
-                this.$message.error(msg);
+  },
+  watch: {
+    $route: {
+      handler: function (newVal, oldVal) {
+        if (newVal.name == "base-resi" && (!oldVal ||oldVal.name === 'home')) {
+          this.$nextTick(() => {
+              this.$refs.myResiSearch.form.attentionCrowds = [];
+              this.$refs.myResiSearch.form.healthStatus = [];
+              this.$refs.myResiSearch.form.specialCategoryCodes = [];
+              this.$refs.myResiSearch.form.partyFlag=null;
+            if (newVal.params.category === 'SPECIAL_SUPPORT_FLAG' ||newVal.params.category === 'SUBSISTENCE_ALLOWANCE_FLAG'|| newVal.params.category === 'VETERAN_FLAG'|| newVal.params.category === 'ENSURE_HOUSE_FLAG'|| newVal.params.category === 'OLD_PEOPLE_FLAG') {
+              this.$refs.myResiSearch.form.attentionCrowds.push(
+                newVal.params.category
+              );
+            } else if(newVal.params.category === 'CHRONIC_DISEASE_FLAG' ||newVal.params.category === 'SERIOUS_ILLNESS_FLAG'||newVal.params.category === 'DISABILITY_FLAG'){
+              this.$refs.myResiSearch.form.healthStatus.push(
+                newVal.params.category
+              );
+            }else if(newVal.params.category === 'SPECIAL_CROWD_FLAG'){
+              this.$refs.myResiSearch.form.specialCategoryCodes = ["anzhibangjiao","shequjiaozheng","xidurenyuan","buliangqingshaonian","zhaoshizhaohuojingshenbing","xiejiaorenyuan"];
+            }else if(newVal.params.category === 'PARTY_FLAG'){
+              this.$refs.myResiSearch.form.partyFlag =1;
             }
-        },
-        async deleteresiBatch() {
-            if (this.selection.length === 0)
-                return this.$message.error("请选择之后进行操作");
-            let userIds = this.selection.map((item) => item.resiId);
-            this.$http
-                .post("/actual/base/residentBaseInfo/batchdel", userIds)
-                .then(({ data: res }) => {
-                    if (res.code !== 0) {
-                        return this.$message.error(res.msg);
-                    } else {
-                        this.$message.success("删除成功");
-                        this.handleSearchFrom();
-                    }
-                })
-                .catch((err) => {
-                    console.log("row4", err);
-                    return this.$message.error("网络错误");
-                });
-        },
-    },
-    watch: {
-        $route: {
-            handler: function (newVal, oldVal) {
-                // console.log(newVal, oldVal)
-                if (newVal.name == "base-resi") {
-                    this.$nextTick(() => {
-                        if (newVal.params.category) {
-                            this.$refs.myResiSearch.form.categoryKey = []
-                            this.$refs.myResiSearch.form.categoryKey.push(newVal.params.category)
-                            this.handleSearchFrom()
-                        } else {
-                            // this.$refs.myResiSearch.form.categoryKey = []
-                            // this.handleSearchFrom()
-                        }
-                    })
-                }
-            },
-            deep: true,
-            immediate: true
+          this.handleSearchFrom();
+          });
         }
+      },
+      deep: true,
+      immediate: true,
     },
+  },
 };
 </script>
 
@@ -1273,214 +1227,248 @@ export default {
 @import "@/assets/scss/modules/management/list-main.scss";
 @import "@/assets/scss/buttonstyle.scss";
 
-::v-deep .el-tabs__nav-next {
-    box-shadow: 2px 0px 9px 0px;
+.g-main {
+  display: flex;
 }
 
-::v-deep .el-tabs__nav-prev {
-    box-shadow: -1px 0px 7px 0px;
+.div_tree {
+  margin: 7px 8px 7px 7px;
+  width: 200px;
+  padding: 24px 15px;
+  background: #ffffff;
+  box-shadow: 0px 6px 16px 0px rgba(0, 0, 0, 0.08),
+    0px 3px 6px -4px rgba(0, 0, 0, 0.12);
+  // border-radius: 5px;
+  overflow-y: hidden;
+
+  .scrollar {
+    margin-top: 30px;
+  }
+
+  /deep/ .el-scrollbar__wrap {
+    overflow-x: hidden !important;
+  }
+
+  /deep/ .el-scrollbar__bar {
+    right: -2px;
+  }
+
+  .custom-tree-node {
+    flex: 1;
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    font-size: 14px;
+    overflow: hidden;
+  }
+
+  .over-ellipsis {
+    display: block;
+    width: 140PX;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+    -webkit-line-clamp: 1;
+  }
+
+  //搜索输入框样式
+  /deep/ .el-input--medium .el-input__inner {
+    height: 32px;
+    background: rgba(0, 0, 0, 0.05);
+    border-radius: 4px;
+  }
+
+  // flex: 0 0 280px;
+  background: #ffffff;
+  box-shadow: 0px 6px 16px 0px rgba(0, 0, 0, 0.08),
+  0px 3px 6px -4px rgba(0, 0, 0, 0.12);
+  // border-radius: 5px;
+  overflow-y: hidden;
 }
 
 .dialog-h {
-    .el-dialog__body {
-        position: relative;
-        max-height: 83vh;
-        box-sizing: border-box;
-        padding: 0 0 20px !important;
-
-        .dialog-h-content {
-            max-height: calc(83vh - 80px);
-            box-sizing: border-box;
-            padding: 50px 70px;
-            overflow: auto;
-        }
+  .el-dialog__body {
+    position: relative;
+    max-height: 83vh;
+    box-sizing: border-box;
+    padding: 0 0 20px !important;
+
+    .dialog-h-content {
+      max-height: calc(83vh - 80px);
+      box-sizing: border-box;
+      padding: 50px 70px;
+      overflow: auto;
     }
+  }
 }
 
 .resi-container ::v-deep .el-row {
-    margin-right: 0;
+  margin-right: 0;
 }
 
 .tabs-other-info {
 
-    // ::v-deep .el-tabs__nav-wrap::after,
-    ::v-deep .el-tabs__active-bar_active {
-        background-color: #0055d7;
-    }
+  // ::v-deep .el-tabs__nav-wrap::after,
+  ::v-deep .el-tabs__active-bar_active {
+    background-color: #0055d7;
+  }
 }
 
 ::v-deep .el-tabs__item {
-    // width: 50px;
-    box-sizing: border-box;
-    padding: 0 10px !important;
-    font-size: 14px;
-    font-weight: 600;
-    color: #666666;
-    border-radius: 2px;
-
-    &:hover {
-        color: #0056d6;
-    }
+  // width: 50px;
+  box-sizing: border-box;
+  padding: 0 10px !important;
+  font-size: 14px;
+  font-weight: 600;
+  color: #666666;
+  border-radius: 2px;
+
+  &:hover {
+    color: #0056d6;
+  }
 }
 
 ::v-deep .el-tabs__item.is-active {
-    color: #0056d6;
+  color: #0056d6;
 }
 
 ::v-deep .el-tabs__active-bar {
-    background-color: #0056d6;
+  background-color: #0056d6;
 }
 
 .resi-container .resi-card {
-    position: relative;
-    overflow: visible;
+  position: relative;
+  overflow: visible;
 }
 
 ::v-deep .el-button--primary.is-plain {
-    color: #0055d7;
-    background: #ffffff;
-    border-color: #0055d7;
+  color: #0055d7;
+  background: #ffffff;
+  border-color: #0055d7;
 }
 
 .resi-container .resi-card-table {
-    ::v-deep .el-table th {
-        color: #fff;
-        background-color: rgba(33, 149, 254, 1);
-        // border-right: 1px solid rgba(33, 149, 254, 1);
-    }
+  ::v-deep .el-table th {
+    color: #fff;
+    background-color: rgba(33, 149, 254, 1);
+    // border-right: 1px solid rgba(33, 149, 254, 1);
+  }
 }
 
 .collapse-title {
-    font-weight: bold;
+  font-weight: bold;
 }
 
 .resi-table {
-    ::v-deep .el-button--text {
-        text-decoration: underline;
-    }
-
-    ::v-deep .btn-color-del {
-        margin-left: 10px;
-        color: rgba(213, 16, 16, 1);
-    }
-
-    ::v-deep .btn-color-edit {
-        color: rgba(0, 167, 169, 1);
-    }
+  ::v-deep .el-button--text {
+    text-decoration: underline;
+  }
+
+  ::v-deep .btn-color-del {
+    margin-left: 10px;
+    color: rgba(213, 16, 16, 1);
+  }
+
+  ::v-deep .btn-color-edit {
+    color: rgba(0, 167, 169, 1);
+  }
 }
 
 .resi-search {
-    // padding-right: 20px;
-    margin-top: 10px;
+  // padding-right: 20px;
+  margin-top: 10px;
 
-    .el-col {
-        text-align: right;
-    }
+  .el-col {
+    text-align: right;
+  }
 }
 
 .resi-down {
-    position: absolute;
-    left: 50%;
-    bottom: -10px;
-    display: flex;
-    justify-content: center;
-    align-items: center;
-    width: 46px;
-    height: 12px;
-    box-sizing: border-box;
-    margin-left: -23rpx;
-    cursor: pointer;
-    background: #ffffff;
-    border-radius: 0 0 10px 10px;
-
-    img {
-        display: block;
-    }
+  position: absolute;
+  left: 50%;
+  bottom: -10px;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  width: 46px;
+  height: 12px;
+  box-sizing: border-box;
+  margin-left: -23rpx;
+  cursor: pointer;
+  background: #ffffff;
+  border-radius: 0 0 10px 10px;
+
+  img {
+    display: block;
+  }
 }
 
 .resi-card-table {
-    margin-top: 20px;
+  margin-top: 20px;
 }
 
 .resi-row-btn {
-    display: flex;
-    margin-bottom: 13px;
-
-    .el-button {
-        margin-left: 10px;
-        border: 0;
-    }
+  display: flex;
+  margin-bottom: 13px;
 
-    // .el-button--success {
-    //   background: rgba(34, 193, 195, 1);
-    // }
-    // .el-button--warning {
-    //   background: rgba(254, 179, 73, 1);
-    // }
-    // .el-button--danger {
-    //   background: rgba(254, 98, 82, 1);
-    // }
+  .el-button {
+    margin-left: 10px;
+    border: 0;
+  }
 }
 
 .resi-other {
-    width: 100%;
-    display: flex;
-
-    .resi-other-title {
-        flex-shrink: 0;
-        // display: inline-block;
-        width: 100px;
-        box-sizing: border-box;
-        margin-bottom: 10px;
-        // padding: 6px 12px 0 0;
-        font-size: 16px;
-        font-weight: 500;
-        color: #333;
-        text-align: center;
-    }
-
-    .tabs-other-info {
-        // display: inline-block;
-        // flex: 1;
-        // padding-left: 60px;
-        width: calc(100% - 100px);
-    }
-}
+  width: 100%;
+  display: flex;
 
-.resi-btns {
-    margin-top: 20px;
+  .resi-other-title {
+    flex-shrink: 0;
+    // display: inline-block;
+    width: 100px;
+    box-sizing: border-box;
+    margin-bottom: 10px;
+    // padding: 6px 12px 0 0;
+    font-size: 16px;
+    font-weight: 500;
+    color: #333;
     text-align: center;
-    text-align: right;
-    margin-right: 16px;
+  }
+
+  .tabs-other-info {
+    // display: inline-block;
+    // flex: 1;
+    // padding-left: 60px;
+    width: calc(100% - 100px);
+  }
 }
 
 .div-flex {
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-    width: 100%;
-
-    .div_del {
-        margin-top: 15px;
-    }
-
-    .m-page {
-        margin-left: auto;
-    }
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  width: 100%;
+
+  .div_del {
+    margin-top: 15px;
+  }
+
+  .m-page {
+    margin-left: auto;
+  }
 }
 
 .el-dropdown-menu {
-    ::v-deep .el-dropdown-menu__item {
-        &:hover {
-            color: #0056d6;
-        }
+  ::v-deep .el-dropdown-menu__item {
+    &:hover {
+      color: #0056d6;
     }
+  }
 }
 
 .resiCategoryInfoBox {
-    overflow: hidden;
-    white-space: nowrap;
-    text-overflow: ellipsis;
-    word-wrap: normal;
+  overflow: hidden;
+  white-space: nowrap;
+  text-overflow: ellipsis;
+  word-wrap: normal;
 }
 </style>
diff --git a/src/views/modules/base/residentManagement/housingNature/addForm.vue b/src/views/modules/base/residentManagement/housingNature/addForm.vue
index ad570bbbe..bf59bb4b8 100644
--- a/src/views/modules/base/residentManagement/housingNature/addForm.vue
+++ b/src/views/modules/base/residentManagement/housingNature/addForm.vue
@@ -22,7 +22,7 @@
               <el-cascader v-if="formType == 'add'"
                            ref="ref_cascader_agency"
                            class="width-two"
-                           v-model="selGridId"
+                           v-model.trim="selGridId"
                            :options="optionsA"
                            @change="handleChangeAngency"
                            :props="{ checkStrictly: true, emitPath: false,children:'subAgencyList',label:'agencyName',value:'agencyId'}"
@@ -46,7 +46,7 @@
                           label="姓名"
                           prop="name"
                           v-else>
-              <el-input v-model="formData.name"
+              <el-input v-model.trim="formData.name"
                         placeholder="请输入"
                         clearable></el-input>
             </el-form-item>
@@ -60,7 +60,7 @@
             <el-form-item :label-width="labelWidth"
                           label="联系电话"
                           v-else>
-              <el-input v-model="formData.mobile"
+              <el-input v-model.trim="formData.mobile"
                         placeholder="请输入"
                         clearable></el-input>
             </el-form-item>
@@ -78,7 +78,7 @@
                           label="证件类型"
                           prop="idType"
                           v-else>
-              <el-select v-model="formData.idType"
+              <el-select v-model.trim="formData.idType"
                          clearable>
                 <el-option v-for="item in idTypeList"
                            :key="item.value"
@@ -98,7 +98,7 @@
                           label="证件号"
                           prop="idNum"
                           v-else>
-              <el-input v-model="formData.idNum"
+              <el-input v-model.trim="formData.idNum"
                         placeholder="请输入"
                         clearable></el-input>
             </el-form-item>
@@ -115,7 +115,7 @@
             <el-form-item :label-width="labelWidth"
                           label="出生日期"
                           v-else>
-              <el-date-picker v-model="formData.birthday"
+              <el-date-picker v-model.trim="formData.birthday"
                               type="date"
                               value-format="yyyy-MM-dd HH:mm:ss"
                               placeholder="选择日期"
@@ -141,7 +141,7 @@
             <el-form-item :label-width="labelWidth"
                           label="性别"
                           v-else>
-              <el-select v-model="formData.gender"
+              <el-select v-model.trim="formData.gender"
                          clearable>
                 <el-option v-for="item in genderList"
                            :key="item.value"
@@ -162,7 +162,7 @@
             <el-form-item :label-width="labelWidth"
                           label="民族"
                           v-else>
-              <el-select v-model="formData.nation"
+              <el-select v-model.trim="formData.nation"
                          clearable>
                 <el-option v-for="item in dicts.nationList"
                            :key="item.value"
@@ -189,7 +189,7 @@
             <el-form-item :label-width="labelWidth"
                           label="本地户籍"
                           v-else>
-              <el-select v-model="formData.localResidenceFlag"
+              <el-select v-model.trim="formData.localResidenceFlag"
                          clearable>
                 <el-option v-for="item in binaryOptionList"
                            :key="item.value"
@@ -212,7 +212,7 @@
                           label="户籍地址"
                           class="wd-wr"
                           v-else>
-              <el-input v-model="formData.placeOfDomicile"
+              <el-input v-model.trim="formData.placeOfDomicile"
                         placeholder="请输入"
                         clearable></el-input>
             </el-form-item>
@@ -230,7 +230,7 @@
                           label="现居地址"
                           class="wd-wr"
                           v-else>
-              <el-input v-model="formData.currentResidence"
+              <el-input v-model.trim="formData.currentResidence"
                         placeholder="请输入"
                         clearable></el-input>
             </el-form-item>
@@ -247,7 +247,7 @@
             <el-form-item :label-width="labelWidth"
                           label="所在社区"
                           v-else>
-              <el-input v-model="formData.liveCommunity"
+              <el-input v-model.trim="formData.liveCommunity"
                         placeholder="请输入"
                         clearable></el-input>
             </el-form-item>
@@ -262,7 +262,7 @@
             <el-form-item :label-width="labelWidth"
                           label="是否为低保"
                           v-else>
-              <el-select v-model="formData.subsistenceAllowanceFlag"
+              <el-select v-model.trim="formData.subsistenceAllowanceFlag"
                          clearable>
                 <el-option v-for="item in binaryOptionList"
                            :key="item.value"
@@ -284,7 +284,7 @@
             <el-form-item :label-width="labelWidth"
                           label="房东姓名"
                           v-else>
-              <el-input v-model="formData.landlordName"
+              <el-input v-model.trim="formData.landlordName"
                         placeholder="请输入"
                         clearable></el-input>
             </el-form-item>
@@ -298,7 +298,7 @@
             <el-form-item :label-width="labelWidth"
                           label="房东身份证号"
                           v-else>
-              <el-input v-model="formData.landlordIdNum"
+              <el-input v-model.trim="formData.landlordIdNum"
                         placeholder="请输入"
                         clearable></el-input>
             </el-form-item>
@@ -315,7 +315,7 @@
             <el-form-item :label-width="labelWidth"
                           label="住房性质"
                           v-else>
-              <el-select v-model="formData.housingNature"
+              <el-select v-model.trim="formData.housingNature"
                          clearable>
                 <el-option v-for="item in dicts.housingNatureList"
                            :key="item.value"
@@ -334,7 +334,7 @@
             <el-form-item :label-width="labelWidth"
                           label="领取通知书日期"
                           v-else>
-              <el-date-picker v-model="formData.notificationRcvDate"
+              <el-date-picker v-model.trim="formData.notificationRcvDate"
                               type="date"
                               value-format="yyyy-MM-dd"
                               placeholder="选择日期"
@@ -355,7 +355,7 @@
             <el-form-item :label-width="labelWidth"
                           label="保障类型"
                           v-else>
-              <el-input v-model="formData.securityType"
+              <el-input v-model.trim="formData.securityType"
                         placeholder="请输入"
                         clearable></el-input>
             </el-form-item>
@@ -369,7 +369,7 @@
             <el-form-item :label-width="labelWidth"
                           label="发证日期"
                           v-else>
-              <el-date-picker v-model="formData.certificateDate"
+              <el-date-picker v-model.trim="formData.certificateDate"
                               type="date"
                               value-format="yyyy-MM-dd"
                               placeholder="发证日期"
@@ -390,7 +390,7 @@
             <el-form-item :label-width="labelWidth"
                           label="补贴编号"
                           v-else>
-              <el-input v-model="formData.subsidyNum"
+              <el-input v-model.trim="formData.subsidyNum"
                         placeholder="请输入"
                         clearable></el-input>
             </el-form-item>
@@ -404,7 +404,7 @@
             <el-form-item :label-width="labelWidth"
                           label="补贴金额"
                           v-else>
-              <el-input v-model="formData.subsidyAmount"
+              <el-input v-model.trim="formData.subsidyAmount"
                         placeholder="请输入"
                         clearable></el-input>
             </el-form-item>
@@ -422,7 +422,7 @@
                           label="备注"
                           class="wd-wr"
                           v-else>
-              <el-input v-model="formData.remark"
+              <el-input v-model.trim="formData.remark"
                         placeholder="请输入"
                         clearable></el-input>
             </el-form-item>
diff --git a/src/views/modules/base/residentManagement/housingNature/housingNature.vue b/src/views/modules/base/residentManagement/housingNature/housingNature.vue
index 82e4b7b52..01b14c937 100644
--- a/src/views/modules/base/residentManagement/housingNature/housingNature.vue
+++ b/src/views/modules/base/residentManagement/housingNature/housingNature.vue
@@ -5,61 +5,61 @@
         <el-form :inline="true" :model="formData" ref="ref_searchform" :label-width="'100px'">
 
           <el-form-item label="住房性质">
-            <el-select v-model="formData.housingNature" placeholder="请输入" size="small" class="u-item-width-normal"
+            <el-select v-model.trim="formData.housingNature" placeholder="请输入" size="small" class="u-item-width-normal"
               clearable>
               <el-option v-for="item in housingNatureList" :key="item.value" :label="item.label" :value="item.value">
               </el-option>
             </el-select>
           </el-form-item>
           <el-form-item label="姓名">
-            <el-input v-model="formData.name" placeholder="请输入" size="small" class="u-item-width-normal"
+            <el-input v-model.trim="formData.name" placeholder="请输入" size="small" class="u-item-width-normal"
               clearable></el-input>
           </el-form-item>
           <el-form-item label="联系电话">
-            <el-input v-model="formData.mobile" placeholder="请输入" size="small" class="u-item-width-normal"
+            <el-input v-model.trim="formData.mobile" placeholder="请输入" size="small" class="u-item-width-normal"
               clearable></el-input>
           </el-form-item>
           <el-form-item label="证件号">
-            <el-input v-model="formData.idNum" placeholder="请输入" size="small" class="u-item-width-normal"
+            <el-input v-model.trim="formData.idNum" placeholder="请输入" size="small" class="u-item-width-normal"
               clearable></el-input>
           </el-form-item>
           <el-form-item label="户籍地址">
-            <el-input v-model="formData.placeOfDomicile" placeholder="请输入" size="small" class="u-item-width-normal"
+            <el-input v-model.trim="formData.placeOfDomicile" placeholder="请输入" size="small" class="u-item-width-normal"
               clearable></el-input>
           </el-form-item>
 
           <el-form-item label="现居地址">
-            <el-input v-model="formData.currentResidence" placeholder="请输入" size="small" class="u-item-width-normal"
+            <el-input v-model.trim="formData.currentResidence" placeholder="请输入" size="small" class="u-item-width-normal"
               clearable></el-input>
           </el-form-item>
 
           <el-form-item label="保障类型">
-            <el-input v-model="formData.securityType" placeholder="请输入" size="small" class="u-item-width-normal"
+            <el-input v-model.trim="formData.securityType" placeholder="请输入" size="small" class="u-item-width-normal"
               clearable></el-input>
           </el-form-item>
 
           <el-form-item label="补贴编号">
-            <el-input v-model="formData.subsidyNum" placeholder="请输入" size="small" class="u-item-width-normal"
+            <el-input v-model.trim="formData.subsidyNum" placeholder="请输入" size="small" class="u-item-width-normal"
               clearable></el-input>
           </el-form-item>
 
           <el-form-item label="补贴金额">
-            <el-input v-model="formData.subsidyAmount" placeholder="请输入" size="small" class="u-item-width-normal"
+            <el-input v-model.trim="formData.subsidyAmount" placeholder="请输入" size="small" class="u-item-width-normal"
               clearable></el-input>
           </el-form-item>
 
           <el-form-item label="发证日期">
-            <el-date-picker v-model="formData.certificateDateStart" type="date" size="small"
+            <el-date-picker v-model.trim="formData.certificateDateStart" type="date" size="small"
               class="u-item-width-daterange" value-format="yyyy-MM-dd" placeholder="开始日期">
             </el-date-picker>
             <span class="u-data-tag">至</span>
-            <el-date-picker v-model="formData.certificateDateEnd" type="date" size="small" value-format="yyyy-MM-dd"
+            <el-date-picker v-model.trim="formData.certificateDateEnd" type="date" size="small" value-format="yyyy-MM-dd"
               class="u-item-width-daterange u-data-tag" placeholder="结束日期" :picker-options="pickerOptionsEnd">
             </el-date-picker>
           </el-form-item>
 
           <el-form-item label="备注">
-            <el-input v-model="formData.remark" placeholder="请输入" size="small" class="u-item-width-normal"
+            <el-input v-model.trim="formData.remark" placeholder="请输入" size="small" class="u-item-width-normal"
               clearable></el-input>
           </el-form-item>
           <el-row type="flex">
diff --git a/src/views/modules/base/residentManagement/louzhang/addForm.vue b/src/views/modules/base/residentManagement/louzhang/addForm.vue
index 2071845d9..55418115d 100644
--- a/src/views/modules/base/residentManagement/louzhang/addForm.vue
+++ b/src/views/modules/base/residentManagement/louzhang/addForm.vue
@@ -10,7 +10,7 @@
 
             </div>
             <el-form-item v-else label="所属组织" label-width="100px" prop="agencyId">
-              <el-cascader v-if="formType == 'add'" ref="ref_cascader_agency" class="width-two" v-model="selGridId"
+              <el-cascader v-if="formType == 'add'" ref="ref_cascader_agency" class="width-two" v-model.trim="selGridId"
                 :options="optionsA" @change="handleChangeAngency"
                 :props="{ checkStrictly: true, emitPath: false, children: 'subAgencyList', label: 'agencyName', value: 'agencyId' }"
                 clearable />
@@ -28,7 +28,7 @@
               <span>{{ formData.name || "--" }}</span>
             </div>
             <el-form-item label-width="100px" label="姓名" prop="name" v-else>
-              <el-input v-model="formData.name" placeholder="请输入" clearable></el-input>
+              <el-input v-model.trim="formData.name" placeholder="请输入" clearable></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -37,7 +37,7 @@
               <span>{{ formData.mobile || "--" }}</span>
             </div>
             <el-form-item label-width="100px" label="联系电话" prop="mobile" v-else>
-              <el-input v-model="formData.mobile" placeholder="请输入" clearable></el-input>
+              <el-input v-model.trim="formData.mobile" placeholder="请输入" clearable></el-input>
             </el-form-item>
           </el-col>
         </el-row>
@@ -50,7 +50,7 @@
               <span>{{ formData.idNum || "--" }}</span>
             </div>
             <el-form-item label-width="100px" label="证件号" prop="idNum" v-else>
-              <el-input v-model="formData.idNum" placeholder="请输入" clearable></el-input>
+              <el-input v-model.trim="formData.idNum" placeholder="请输入" clearable></el-input>
             </el-form-item>
           </el-col>
 
@@ -60,7 +60,7 @@
               <span>{{ formData.idTypeName || "--" }}</span>
             </div>
             <el-form-item label-width="100px" label="类型" prop="dormitoryTypeArray" v-else>
-              <el-select v-model="formData.dormitoryTypeArray" multiple clearable>
+              <el-select v-model.trim="formData.dormitoryTypeArray" multiple clearable>
                 <el-option v-for="item in dormitoryTypeList" :key="item.value" :label="item.label" :value="item.value">
                 </el-option>
               </el-select>
@@ -76,7 +76,7 @@
             </div>
 
             <el-form-item label-width="100px" label="管理范围" prop="rangeList" v-else>
-              <el-cascader ref="cascaderUnit" class="width-two" v-model="formData.rangeList" :options="optionsRange"
+              <el-cascader ref="cascaderUnit" class="width-two" v-model.trim="formData.rangeList" :options="optionsRange"
                 @change="handleChangeRange"
                 :props="{ multiple: true, checkStrictly: true, emitPath: true, children: 'subAgencyList', label: 'agencyName', value: 'agencyId' }"
                 :disabled="formType === 'detail'" clearable />
diff --git a/src/views/modules/base/residentManagement/louzhang/louzhangList.vue b/src/views/modules/base/residentManagement/louzhang/louzhangList.vue
index e9badd8a4..e2fa62bdf 100644
--- a/src/views/modules/base/residentManagement/louzhang/louzhangList.vue
+++ b/src/views/modules/base/residentManagement/louzhang/louzhangList.vue
@@ -4,19 +4,19 @@
       <div class="m-search">
         <el-form :inline="true" :model="formData" ref="ref_searchform" :label-width="'100px'">
           <el-form-item label="姓名">
-            <el-input v-model="formData.name" placeholder="请输入" size="small" class="u-item-width-normal"
+            <el-input v-model.trim="formData.name" placeholder="请输入" size="small" class="u-item-width-normal"
               clearable></el-input>
           </el-form-item>
           <el-form-item label="联系电话">
-            <el-input v-model="formData.mobile" placeholder="请输入" size="small" class="u-item-width-normal"
+            <el-input v-model.trim="formData.mobile" placeholder="请输入" size="small" class="u-item-width-normal"
               clearable></el-input>
           </el-form-item>
           <el-form-item label="证件号">
-            <el-input v-model="formData.idNum" placeholder="请输入" size="small" class="u-item-width-normal"
+            <el-input v-model.trim="formData.idNum" placeholder="请输入" size="small" class="u-item-width-normal"
               clearable></el-input>
           </el-form-item>
           <el-form-item label="类别">
-            <el-select v-model="formData.dormitoryType" placeholder="请输入" size="small" class="u-item-width-normal"
+            <el-select v-model.trim="formData.dormitoryType" placeholder="请输入" size="small" class="u-item-width-normal"
               clearable>
               <el-option v-for="item in dormitoryTypeList" :key="item.value" :label="item.label" :value="item.value">
               </el-option>
diff --git a/src/views/modules/base/residentManagement/oldPeople/addForm.vue b/src/views/modules/base/residentManagement/oldPeople/addForm.vue
index 66cc060fc..7248dc34f 100644
--- a/src/views/modules/base/residentManagement/oldPeople/addForm.vue
+++ b/src/views/modules/base/residentManagement/oldPeople/addForm.vue
@@ -10,7 +10,7 @@
                         </div>
                         <el-form-item v-else label="所属组织" label-width="104px" prop="agencyId">
                             <el-cascader v-if="formType == 'add'" ref="ref_cascader_agency" class="width-two"
-                                v-model="selGridId" :options="optionsA" @change="handleChangeAngency"
+                                v-model.trim="selGridId" :options="optionsA" @change="handleChangeAngency"
                                 :props="{ checkStrictly: true, emitPath: false, children: 'subAgencyList', label: 'agencyName', value: 'agencyId' }"
                                 clearable />
                             <span v-else>{{ formData.agencyName || "--" }}</span>
@@ -25,7 +25,7 @@
                             <span>{{ formData.name || "--" }}</span>
                         </div>
                         <el-form-item label-width="104px" label="姓名" prop="name" v-else>
-                            <el-input v-model="formData.name" placeholder="请输入" clearable></el-input>
+                            <el-input v-model.trim="formData.name" placeholder="请输入" clearable></el-input>
                         </el-form-item>
                     </el-col>
                     <el-col :span="12">
@@ -34,7 +34,7 @@
                             <span>{{ formData.mobile || "--" }}</span>
                         </div>
                         <el-form-item label-width="104px" label="联系电话" v-else>
-                            <el-input v-model="formData.mobile" placeholder="请输入" clearable></el-input>
+                            <el-input v-model.trim="formData.mobile" placeholder="请输入" clearable></el-input>
                         </el-form-item>
                     </el-col>
                 </el-row>
@@ -46,7 +46,7 @@
                             <span>{{ formData.idTypeName || "--" }}</span>
                         </div>
                         <el-form-item label-width="104px" label="证件类型" prop="idType" v-else>
-                            <el-select v-model="formData.idType" clearable>
+                            <el-select v-model.trim="formData.idType" clearable>
                                 <el-option v-for="item in dicts.idCard_type" :key="item.value" :label="item.label"
                                     :value="item.value">
                                 </el-option>
@@ -59,7 +59,7 @@
                             <span>{{ formData.idNum || "--" }}</span>
                         </div>
                         <el-form-item label-width="104px" label="证件号" prop="idNum" v-else>
-                            <el-input v-model="formData.idNum" placeholder="请输入" clearable></el-input>
+                            <el-input v-model.trim="formData.idNum" placeholder="请输入" clearable></el-input>
                         </el-form-item>
                     </el-col>
                 </el-row>
@@ -79,7 +79,7 @@
                             }}</span>
                         </div>
                         <el-form-item label-width="104px" label="本地户籍" v-else>
-                            <el-select v-model="formData.localResidenceFlag" clearable>
+                            <el-select v-model.trim="formData.localResidenceFlag" clearable>
                                 <el-option v-for="item in binaryOptionList" :key="item.value" :label="item.label"
                                     :value="item.value">
                                 </el-option>
@@ -95,7 +95,7 @@
                             <span>{{ formData.placeOfDomicile || "--" }}</span>
                         </div>
                         <el-form-item label-width="104px" label="户籍地址" class="wd-wr" v-else>
-                            <el-input v-model="formData.placeOfDomicile" placeholder="请输入" clearable></el-input>
+                            <el-input v-model.trim="formData.placeOfDomicile" placeholder="请输入" clearable></el-input>
                         </el-form-item>
                     </el-col>
                 </el-row>
@@ -107,7 +107,7 @@
                             <span>{{ formData.currentResidence || "--" }}</span>
                         </div>
                         <el-form-item label-width="104px" label="现居地址" class="wd-wr" v-else>
-                            <el-input v-model="formData.currentResidence" placeholder="请输入" clearable></el-input>
+                            <el-input v-model.trim="formData.currentResidence" placeholder="请输入" clearable></el-input>
                         </el-form-item>
                     </el-col>
                 </el-row>
@@ -127,7 +127,7 @@
                             }}</span>
                         </div>
                         <el-form-item label-width="104px" label="是否残疾" v-else>
-                            <el-select v-model="formData.disabilityFlag" clearable>
+                            <el-select v-model.trim="formData.disabilityFlag" clearable>
                                 <el-option v-for="item in binaryOptionList" :key="item.value" :label="item.label"
                                     :value="item.value">
                                 </el-option>
@@ -140,7 +140,7 @@
                             <span>{{ formData.disabilityCategoryName || "--" }}</span>
                         </div>
                         <el-form-item label-width="104px" label="残疾类别" v-else>
-                            <el-select v-model="formData.disabilityCategoryCode" clearable>
+                            <el-select v-model.trim="formData.disabilityCategoryCode" clearable>
                                 <el-option v-for="item in dicts.disability_category_code" :key="item.value"
                                     :label="item.label" :value="item.value">
                                 </el-option>
@@ -157,7 +157,7 @@
                             <span>{{ formData.disabilityLevelName || "--" }}</span>
                         </div>
                         <el-form-item label-width="104px" label="残疾级别" v-else>
-                            <el-select v-model="formData.disabilityLevel" clearable>
+                            <el-select v-model.trim="formData.disabilityLevel" clearable>
                                 <el-option v-for="item in dicts.disability_level" :key="item.value" :label="item.label"
                                     :value="item.value">
                                 </el-option>
@@ -170,7 +170,7 @@
                             <span>{{ formData.disabilityNum || "--" }}</span>
                         </div>
                         <el-form-item label-width="104px" label="残疾证号" v-else>
-                            <el-input v-model="formData.disabilityNum" placeholder="请输入" clearable></el-input>
+                            <el-input v-model.trim="formData.disabilityNum" placeholder="请输入" clearable></el-input>
                         </el-form-item>
                     </el-col>
                 </el-row>
@@ -182,7 +182,7 @@
                             <span>{{ formData.houseHolderRelName || "--" }}</span>
                         </div>
                         <el-form-item label-width="104px" label="与户主关系" v-else>
-                            <el-select v-model="formData.houseHolderRel" clearable>
+                            <el-select v-model.trim="formData.houseHolderRel" clearable>
                                 <el-option v-for="item in dicts.resi_base_info" :key="item.value"
                                     :label="item.label" :value="item.value">
                                 </el-option>
@@ -195,7 +195,7 @@
                             <span>{{ formData.resideSituationName || "--" }}</span>
                         </div>
                         <el-form-item label-width="104px" label="居住情况" v-else>
-                            <el-select v-model="formData.resideSituation" clearable>
+                            <el-select v-model.trim="formData.resideSituation" clearable>
                                 <el-option v-for="item in dicts.reside_situation" :key="item.value"
                                     :label="item.label" :value="item.value">
                                 </el-option>
@@ -210,7 +210,7 @@
                             <span>{{ formData.monthIncome || "--" }}</span>
                         </div>
                         <el-form-item label-width="104px" label="月收入" v-else>
-                            <el-input v-model="formData.monthIncome" placeholder="请输入" clearable
+                            <el-input v-model.trim="formData.monthIncome" placeholder="请输入" clearable
                                 @blur="monthIncomeNumberInput"></el-input>
                         </el-form-item>
                     </el-col>
@@ -222,7 +222,7 @@
                             <span>{{ formData.marriageName || "--" }}</span>
                         </div>
                         <el-form-item label-width="104px" label="婚姻情况" v-else>
-                            <el-select v-model="formData.marriage" clearable>
+                            <el-select v-model.trim="formData.marriage" clearable>
                                 <el-option v-for="item in dicts.marriage" :key="item.value"
                                     :label="item.label" :value="item.value">
                                 </el-option>
@@ -236,7 +236,7 @@
                             <span>{{ formData.spouseSituationName || "--" }}</span>
                         </div>
                         <el-form-item label-width="104px" label="配偶情况" v-else>
-                            <el-select v-model="formData.spouseSituation" clearable>
+                            <el-select v-model.trim="formData.spouseSituation" clearable>
                                 <el-option v-for="item in dicts.spouse_situation" :key="item.value"
                                     :label="item.label" :value="item.value">
                                 </el-option>
@@ -251,7 +251,7 @@
                             <span>{{ formData.retirementAmount || "--" }}</span>
                         </div>
                         <el-form-item label-width="104px" label="退休金额" v-else>
-                            <el-input v-model="formData.retirementAmount" placeholder="请输入" clearable
+                            <el-input v-model.trim="formData.retirementAmount" placeholder="请输入" clearable
                                 @blur="checkRetirementAmountNumberInput"></el-input>
                         </el-form-item>
                     </el-col>
@@ -261,7 +261,7 @@
                             <span>{{ formData.oldSubsidy || "--" }}</span>
                         </div>
                         <el-form-item label-width="104px" label="高龄补助" v-else>
-                            <el-input v-model="formData.oldSubsidy" placeholder="请输入" clearable
+                            <el-input v-model.trim="formData.oldSubsidy" placeholder="请输入" clearable
                             @blur="checkOldSubsidyInput" ></el-input>
                         </el-form-item>
                     </el-col>
@@ -281,7 +281,7 @@
                             }}</span>
                         </div>
                         <el-form-item label-width="104px" label="有无赡养人" v-else>
-                            <el-select v-model="formData.elderlyFlag" clearable>
+                            <el-select v-model.trim="formData.elderlyFlag" clearable>
                                 <el-option v-for="item in elderlyList" :key="item.value" :label="item.label"
                                     :value="item.value">
                                 </el-option>
@@ -294,7 +294,7 @@
                             <span>{{ formData.elderlyRelationName || "--" }}</span>
                         </div>
                         <el-form-item label-width="104px" label="与赡养人关系" v-else>
-                            <el-select v-model="formData.elderlyRelation" clearable>
+                            <el-select v-model.trim="formData.elderlyRelation" clearable>
                                 <el-option v-for="item in dicts.resi_base_info" :key="item.value"
                                     :label="item.label" :value="item.value">
                                 </el-option>
@@ -309,7 +309,7 @@
                             <span>{{ formData.dependantMobile || "--" }}</span>
                         </div>
                         <el-form-item label-width="104px" label="赡养人联系电话" v-else>
-                            <el-input v-model="formData.dependantMobile" placeholder="请输入" clearable></el-input>
+                            <el-input v-model.trim="formData.dependantMobile" placeholder="请输入" clearable></el-input>
                         </el-form-item>
                     </el-col>
                 </el-row>
@@ -321,7 +321,7 @@
                             <span>{{ formData.remark || "--" }}</span>
                         </div>
                         <el-form-item label-width="104px" label="备注" class="wd-wr" v-else>
-                            <el-input v-model="formData.remark" placeholder="请输入" clearable></el-input>
+                            <el-input v-model.trim="formData.remark" placeholder="请输入" clearable></el-input>
                         </el-form-item>
                     </el-col>
                 </el-row>
diff --git a/src/views/modules/base/residentManagement/oldPeople/oldPeople.vue b/src/views/modules/base/residentManagement/oldPeople/oldPeople.vue
index 3bca65d5f..a9c0ec401 100644
--- a/src/views/modules/base/residentManagement/oldPeople/oldPeople.vue
+++ b/src/views/modules/base/residentManagement/oldPeople/oldPeople.vue
@@ -10,7 +10,7 @@
           >
             <el-form-item label="姓名">
               <el-input
-                v-model="formData.name"
+                v-model.trim="formData.name"
                 placeholder="请输入"
                 size="small"
                 class="u-item-width-normal"
@@ -19,7 +19,7 @@
             </el-form-item>
             <el-form-item label="联系电话">
               <el-input
-                v-model="formData.mobile"
+                v-model.trim="formData.mobile"
                 placeholder="请输入"
                 size="small"
                 class="u-item-width-normal"
@@ -28,7 +28,7 @@
             </el-form-item>
             <el-form-item label="证件号">
               <el-input
-                v-model="formData.idNum"
+                v-model.trim="formData.idNum"
                 placeholder="请输入"
                 size="small"
                 class="u-item-width-normal"
@@ -37,7 +37,7 @@
             </el-form-item>
             <!-- <el-form-item label="性别">
               <el-select
-                v-model="formData.gender"
+                v-model.trim="formData.gender"
                 placeholder="请输入"
                 size="small"
                 class="u-item-width-normal"
@@ -54,7 +54,7 @@
             </el-form-item> -->
             <el-form-item label="居住地址">
               <el-input
-                v-model="formData.currentResidence"
+                v-model.trim="formData.currentResidence"
                 placeholder="请输入"
                 size="small"
                 class="u-item-width-normal"
@@ -63,7 +63,7 @@
             </el-form-item>
             <el-form-item label="是否残疾">
               <el-select
-                v-model="formData.disabilityFlag"
+                v-model.trim="formData.disabilityFlag"
                 placeholder="请输入"
                 size="small"
                 class="u-item-width-normal"
@@ -80,7 +80,7 @@
             </el-form-item>
             <el-form-item label="居住情况">
               <el-select
-                v-model="formData.resideSituation"
+                v-model.trim="formData.resideSituation"
                 placeholder="请输入"
                 size="small"
                 class="u-item-width-normal"
@@ -98,7 +98,7 @@
        
             <el-form-item label="婚姻情况">
               <el-select
-                v-model="formData.marriage"
+                v-model.trim="formData.marriage"
                 placeholder="请输入"
                 size="small"
                 class="u-item-width-normal"
@@ -115,7 +115,7 @@
             </el-form-item>
             <el-form-item label="有无赡养人">
               <el-select
-                v-model="formData.elderlyList"
+                v-model.trim="formData.elderlyList"
                 placeholder="请输入"
                 size="small"
                 class="u-item-width-normal"
@@ -132,7 +132,7 @@
             </el-form-item>
             <el-form-item label="备注">
               <el-input
-                v-model="formData.remark"
+                v-model.trim="formData.remark"
                 placeholder="请输入"
                 size="small"
                 class="u-item-width-normal"
diff --git a/src/views/modules/base/residentManagement/publicWelfarePost/addForm.vue b/src/views/modules/base/residentManagement/publicWelfarePost/addForm.vue
index 4e94cb5a0..fb86732ba 100644
--- a/src/views/modules/base/residentManagement/publicWelfarePost/addForm.vue
+++ b/src/views/modules/base/residentManagement/publicWelfarePost/addForm.vue
@@ -9,7 +9,7 @@
                             <span>{{ formData.agencyName || "--" }}</span>
                         </div>
                         <el-form-item label="所属组织" prop="agencyId" label-width="100px" v-else>
-                            <el-cascader class="u-item-width-normal" ref="ref_cascader_agency" v-model="agencyIdTemp"
+                            <el-cascader class="u-item-width-normal" ref="ref_cascader_agency" v-model.trim="agencyIdTemp"
                                 :options="orgOptions" :props="orgOptionProps" :show-all-levels="false"
                                 @change="handleChangeAgency" clearable>
                             </el-cascader>
@@ -23,7 +23,7 @@
                             <span>{{ formData.name || "--" }}</span>
                         </div>
                         <el-form-item label-width="100px" label="姓名" prop="name" v-else>
-                            <el-input v-model="formData.name" placeholder="请输入" clearable></el-input>
+                            <el-input v-model.trim="formData.name" placeholder="请输入" clearable></el-input>
                         </el-form-item>
                     </el-col>
                     <el-col :span="12">
@@ -40,7 +40,7 @@
                             }}</span>
                         </div>
                         <el-form-item label-width="100px" label="性别" v-else>
-                            <el-select v-model="formData.gender" clearable>
+                            <el-select v-model.trim="formData.gender" clearable>
                                 <el-option v-for="item in genderList" :key="item.value" :label="item.label"
                                     :value="item.value">
                                 </el-option>
@@ -56,7 +56,7 @@
                             <span>{{ formData.birthday || '--' }}</span>
                         </div>
                         <el-form-item label-width="100px" label="出生日期" v-else>
-                            <el-date-picker v-model="formData.birthday" type="date" value-format="yyyy-MM-dd HH:mm:ss"
+                            <el-date-picker v-model.trim="formData.birthday" type="date" value-format="yyyy-MM-dd HH:mm:ss"
                                 placeholder="选择日期" style="width: 202px" clearable>
                             </el-date-picker>
                         </el-form-item>
@@ -67,7 +67,7 @@
                             <span>{{ formData.nationName || "--" }}</span>
                         </div>
                         <el-form-item label-width="100px" label="民族" v-else>
-                            <el-select v-model="formData.nation" clearable>
+                            <el-select v-model.trim="formData.nation" clearable>
                                 <el-option v-for="item in dicts.nationList" :key="item.value" :label="item.label"
                                     :value="item.value">
                                 </el-option>
@@ -83,7 +83,7 @@
                             <span>{{ formData.idNum || "--" }}</span>
                         </div>
                         <el-form-item label-width="100px" label="证件号" prop="idNum" v-else>
-                            <el-input v-model="formData.idNum" placeholder="请输入" clearable></el-input>
+                            <el-input v-model.trim="formData.idNum" placeholder="请输入" clearable></el-input>
                         </el-form-item>
                     </el-col>
                     <el-col :span="12">
@@ -92,7 +92,7 @@
                             <span>{{ formData.mobile || "--" }}</span>
                         </div>
                         <el-form-item label-width="100px" label="联系电话" v-else>
-                            <el-input v-model="formData.mobile" placeholder="请输入" clearable></el-input>
+                            <el-input v-model.trim="formData.mobile" placeholder="请输入" clearable></el-input>
                         </el-form-item>
                     </el-col>
                 </el-row>
@@ -103,7 +103,7 @@
                             <span>{{ formData.idTypeName || "--" }}</span>
                         </div>
                         <el-form-item label-width="100px" label="证件类型" prop="idType" v-else>
-                            <el-select v-model="formData.idType" clearable>
+                            <el-select v-model.trim="formData.idType" clearable>
                                 <el-option v-for="item in idTypeList" :key="item.value" :label="item.label"
                                     :value="item.value">
                                 </el-option>
@@ -118,7 +118,7 @@
                             <span>{{ cultureLevelName(formData.cultureLevel) }}</span>
                         </div>
                         <el-form-item label-width="100px" label="文化程度" v-else>
-                            <el-select v-model="formData.cultureLevel" clearable>
+                            <el-select v-model.trim="formData.cultureLevel" clearable>
                                 <el-option v-for="item in dicts.educationList" :key="item.value" :label="item.label"
                                     :value="item.value">
                                 </el-option>
@@ -139,7 +139,7 @@
                             }}</span>
                         </div>
                         <el-form-item label-width="100px" label="是否党员" v-else>
-                            <el-select v-model="formData.isParty" clearable>
+                            <el-select v-model.trim="formData.isParty" clearable>
                                 <el-option v-for="item in binaryOptionList" :key="item.value" :label="item.label"
                                     :value="item.value">
                                 </el-option>
@@ -155,7 +155,7 @@
                             <span>{{ formData.postTypeNames || '--' }}</span>
                         </div>
                         <el-form-item label-width="100px" label="岗位类型" prop="postTypes" v-else>
-                            <el-select v-model="formData.postTypes" multiple collapse-tags clearable>
+                            <el-select v-model.trim="formData.postTypes" multiple collapse-tags clearable>
                                 <el-option v-for="item in dicts.public_welfare_post_type" :key="item.value"
                                     :label="item.label" :value="item.value">
                                 </el-option>
@@ -168,7 +168,7 @@
                             <span>{{ formData.hireData || '--' }}</span>
                         </div>
                         <el-form-item label-width="100px" label="入职时间" v-else>
-                            <el-date-picker v-model="formData.hireData" type="date" value-format="yyyy-MM-dd HH:mm:ss"
+                            <el-date-picker v-model.trim="formData.hireData" type="date" value-format="yyyy-MM-dd HH:mm:ss"
                                 placeholder="选择日期" style="width: 202px" clearable>
                             </el-date-picker>
                         </el-form-item>
@@ -184,7 +184,7 @@
                             <span>{{ formData.currentResidence || "--" }}</span>
                         </div>
                         <el-form-item label-width="100px" label="现居地址" class="wd-wr" v-else>
-                            <el-input v-model="formData.currentResidence" placeholder="请输入" clearable></el-input>
+                            <el-input v-model.trim="formData.currentResidence" placeholder="请输入" clearable></el-input>
                         </el-form-item>
                     </el-col>
                 </el-row>
@@ -197,7 +197,7 @@
                         </div>
 
                         <el-form-item label-width="100px" label="兴趣特长" v-else class="wd-wr">
-                            <el-checkbox-group size="small" v-model="formData.hobbyCodes">
+                            <el-checkbox-group size="small" v-model.trim="formData.hobbyCodes">
                                 <el-checkbox v-for="items in dicts.SPECIAL_SKILL" :label="items.value" :key="items.value"
                                     :value="items.value">{{ items.label }}</el-checkbox>
                             </el-checkbox-group>
@@ -214,7 +214,7 @@
                             <span>{{ formData.interestDesc || "--" }}</span>
                         </div>
                         <el-form-item label-width="100px" label="兴趣描述" v-else>
-                            <el-input v-model="formData.interestDesc" placeholder="请输入" clearable></el-input>
+                            <el-input v-model.trim="formData.interestDesc" placeholder="请输入" clearable></el-input>
                         </el-form-item>
                     </el-col>
                 </el-row>
@@ -226,7 +226,7 @@
                             <span>{{ formData.remark || "--" }}</span>
                         </div>
                         <el-form-item label-width="100px" label="备注" class="wd-wr" v-else>
-                            <el-input v-model="formData.remark" placeholder="请输入" clearable></el-input>
+                            <el-input v-model.trim="formData.remark" placeholder="请输入" clearable></el-input>
                         </el-form-item>
                     </el-col>
                 </el-row>
@@ -238,7 +238,7 @@
                             <span>{{ formData.rangeString || "--" }}</span>
                         </div>
                         <el-form-item label="管理范围" prop="agencyId" label-width="100px" v-else>
-                            <el-cascader class="u-item-width-normal" ref="myCascader" v-model="formData.rangeList"
+                            <el-cascader class="u-item-width-normal" ref="myCascader" v-model.trim="formData.rangeList"
                                 :options="optionsRange"
                                 :props="{ multiple: true, checkStrictly: true, emitPath: true, children: 'subAgencyList', label: 'agencyName', value: 'agencyId' }"
                                 :show-all-levels="false" @change="handleChangeManageScopes" clearable>
diff --git a/src/views/modules/base/residentManagement/publicWelfarePost/publicWelfarePost.vue b/src/views/modules/base/residentManagement/publicWelfarePost/publicWelfarePost.vue
index 13399776a..c15483323 100644
--- a/src/views/modules/base/residentManagement/publicWelfarePost/publicWelfarePost.vue
+++ b/src/views/modules/base/residentManagement/publicWelfarePost/publicWelfarePost.vue
@@ -10,7 +10,7 @@
           >
             <el-form-item label="姓名">
               <el-input
-                v-model="formData.name"
+                v-model.trim="formData.name"
                 placeholder="请输入"
                 size="small"
                 class="u-item-width-normal"
@@ -19,7 +19,7 @@
             </el-form-item>
             <el-form-item label="性别">
               <el-select
-                v-model="formData.gender"
+                v-model.trim="formData.gender"
                 placeholder="请输入"
                 size="small"
                 class="u-item-width-normal"
@@ -36,7 +36,7 @@
             </el-form-item>
             <el-form-item label="年龄">
               <el-date-picker
-                v-model="formData.birthdayStart"
+                v-model.trim="formData.birthdayStart"
                 type="date"
                 size="small"
                 class="u-item-width-daterange"
@@ -48,7 +48,7 @@
               <span class="u-data-tag">至</span>
               <!-- :picker-options="endPickerOptionsBirthday" -->
               <el-date-picker
-                v-model="formData.birthdayEnd"
+                v-model.trim="formData.birthdayEnd"
                 type="date"
                 size="small"
                 value-format="yyyy-MM-dd"
@@ -59,7 +59,7 @@
             </el-form-item>
             <el-form-item label="证件号">
               <el-input
-                v-model="formData.idNum"
+                v-model.trim="formData.idNum"
                 placeholder="请输入"
                 size="small"
                 class="u-item-width-normal"
@@ -68,7 +68,7 @@
             </el-form-item>
             <el-form-item label="文化程度">
               <el-select
-                v-model="formData.cultureLevel"
+                v-model.trim="formData.cultureLevel"
                 placeholder="请选择"
                 size="small"
                 class="u-item-width-normal"
@@ -84,7 +84,7 @@
               </el-select>
             </el-form-item>
             <el-form-item label-width="100px" label="岗位类型" prop="postTypes" >
-                <el-select v-model="formData.postTypes" multiple collapse-tags clearable size="small" class="u-item-width-normal"> 
+                <el-select v-model.trim="formData.postTypes" multiple collapse-tags clearable size="small" class="u-item-width-normal"> 
                     <el-option
                     v-for="item in dicts.public_welfare_post_type"
                     :key="item.value"
@@ -97,7 +97,7 @@
                 <el-form-item label="入职时间">
                   <!-- :picker-options="startPickerOptions" -->
               <el-date-picker
-                v-model="formData.hireDateFrom"
+                v-model.trim="formData.hireDateFrom"
                 type="date"
                 size="small"
                 class="u-item-width-daterange"
@@ -109,7 +109,7 @@
                 
               <!-- :picker-options="endPickerOptionsBirthday" -->
               <el-date-picker
-                v-model="formData.hireDateEnd"
+                v-model.trim="formData.hireDateEnd"
                 type="date"
                 size="small"
                 value-format="yyyy-MM-dd"
diff --git a/src/views/modules/base/residentManagement/resiDisability/addForm.vue b/src/views/modules/base/residentManagement/resiDisability/addForm.vue
index 00a0bb64f..b8f4b0b7f 100644
--- a/src/views/modules/base/residentManagement/resiDisability/addForm.vue
+++ b/src/views/modules/base/residentManagement/resiDisability/addForm.vue
@@ -9,7 +9,7 @@
               <span>{{ formData.agencyName || "--" }}</span>
             </div>
             <el-form-item v-else label="所属组织" label-width="100px" prop="agencyId">
-              <el-cascader v-if="formType == 'add'" ref="ref_cascader_agency" class="width-two" v-model="selGridId"
+              <el-cascader v-if="formType == 'add'" ref="ref_cascader_agency" class="width-two" v-model.trim="selGridId"
                 :options="optionsA" @change="handleChangeAngency"
                 :props="{ checkStrictly: true, emitPath: false, children: 'subAgencyList', label: 'agencyName', value: 'agencyId' }"
                 clearable />
@@ -27,7 +27,7 @@
               <span>{{ formData.name || "--" }}</span>
             </div>
             <el-form-item label-width="100px" label="姓名" prop="name" v-else>
-              <el-input v-model="formData.name" placeholder="请输入" clearable></el-input>
+              <el-input v-model.trim="formData.name" placeholder="请输入" clearable></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -36,7 +36,7 @@
               <span>{{ formData.mobile || "--" }}</span>
             </div>
             <el-form-item label-width="100px" label="联系电话" v-else>
-              <el-input v-model="formData.mobile" placeholder="请输入" clearable></el-input>
+              <el-input v-model.trim="formData.mobile" placeholder="请输入" clearable></el-input>
             </el-form-item>
           </el-col>
         </el-row>
@@ -48,7 +48,7 @@
               <span>{{ formData.idTypeName || "--" }}</span>
             </div>
             <el-form-item label-width="100px" label="证件类型" prop="idType" v-else>
-              <el-select v-model="formData.idType" clearable>
+              <el-select v-model.trim="formData.idType" clearable>
                 <el-option v-for="item in dicts.idCard_type" :key="item.value" :label="item.label" :value="item.value">
                 </el-option>
               </el-select>
@@ -60,7 +60,7 @@
               <span>{{ formData.idNum || "--" }}</span>
             </div>
             <el-form-item label-width="100px" label="证件号" prop="idNum" v-else>
-              <el-input v-model="formData.idNum" placeholder="请输入" clearable></el-input>
+              <el-input v-model.trim="formData.idNum" placeholder="请输入" clearable></el-input>
             </el-form-item>
           </el-col>
         </el-row>
@@ -80,7 +80,7 @@
               }}</span>
             </div>
             <el-form-item label-width="100px" label="性别" v-else>
-              <el-select v-model="formData.gender" clearable>
+              <el-select v-model.trim="formData.gender" clearable>
                 <el-option v-for="item in genderList" :key="item.value" :label="item.label" :value="item.value">
                 </el-option>
               </el-select>
@@ -100,7 +100,7 @@
               }}</span>
             </div>
             <el-form-item label-width="100px" label="本地户籍" v-else>
-              <el-select v-model="formData.localResidenceFlag" clearable>
+              <el-select v-model.trim="formData.localResidenceFlag" clearable>
                 <el-option v-for="item in binaryOptionList" :key="item.value" :label="item.label" :value="item.value">
                 </el-option>
               </el-select>
@@ -115,7 +115,7 @@
               <span>{{ formData.placeOfDomicile || "--" }}</span>
             </div>
             <el-form-item label-width="100px" label="户籍地址" class="wd-wr" v-else>
-              <el-input v-model="formData.placeOfDomicile" placeholder="请输入" clearable></el-input>
+              <el-input v-model.trim="formData.placeOfDomicile" placeholder="请输入" clearable></el-input>
             </el-form-item>
           </el-col>
         </el-row>
@@ -127,7 +127,7 @@
               <span>{{ formData.currentResidence || "--" }}</span>
             </div>
             <el-form-item label-width="100px" label="现居地址" class="wd-wr" v-else>
-              <el-input v-model="formData.currentResidence" placeholder="请输入" clearable></el-input>
+              <el-input v-model.trim="formData.currentResidence" placeholder="请输入" clearable></el-input>
             </el-form-item>
           </el-col>
         </el-row>
@@ -139,7 +139,7 @@
               <span>{{ formData.disabilityCategoryName || "--" }}</span>
             </div>
             <el-form-item label-width="100px" label="残疾类别" v-else>
-              <el-select v-model="formData.disabilityCategoryCode" clearable>
+              <el-select v-model.trim="formData.disabilityCategoryCode" clearable>
                 <el-option v-for="item in dicts.disability_category_code" :key="item.value" :label="item.label"
                   :value="item.value">
                 </el-option>
@@ -152,7 +152,7 @@
               <span>{{ formData.disabilityLevelName || "--" }}</span>
             </div>
             <el-form-item label-width="100px" label="残疾级别" v-else>
-              <el-select v-model="formData.disabilityLevel" clearable>
+              <el-select v-model.trim="formData.disabilityLevel" clearable>
                 <el-option v-for="item in dicts.disability_level" :key="item.value" :label="item.label"
                   :value="item.value">
                 </el-option>
@@ -168,7 +168,7 @@
               <span>{{ formData.disabilityNum || "--" }}</span>
             </div>
             <el-form-item label-width="100px" label="残疾证号" v-else>
-              <el-input v-model="formData.disabilityNum" placeholder="请输入" clearable></el-input>
+              <el-input v-model.trim="formData.disabilityNum" placeholder="请输入" clearable></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -185,7 +185,7 @@
               }}</span>
             </div>
             <el-form-item label-width="100px" label="低保" v-else>
-              <el-select v-model="formData.subsistenceAllowanceFlag" clearable>
+              <el-select v-model.trim="formData.subsistenceAllowanceFlag" clearable>
                 <el-option v-for="item in binaryOptionList" :key="item.value" :label="item.label" :value="item.value">
                 </el-option>
               </el-select>
@@ -200,7 +200,7 @@
               <span>{{ formData.retirementAmount || "--" }}</span>
             </div>
             <el-form-item label-width="100px" label="退休金额" v-else>
-              <el-input v-model="formData.retirementAmount" placeholder="请输入" clearable
+              <el-input v-model.trim="formData.retirementAmount" placeholder="请输入" clearable
                 @blur="checkNumberInput"></el-input>
             </el-form-item>
           </el-col>
@@ -210,7 +210,7 @@
               <span>{{ formData.monthIncome || "--" }}</span>
             </div>
             <el-form-item label-width="100px" label="月收入" v-else>
-              <el-input v-model="formData.monthIncome" placeholder="请输入" clearable
+              <el-input v-model.trim="formData.monthIncome" placeholder="请输入" clearable
                 @blur="monthIncomeNumberInput"></el-input>
             </el-form-item>
           </el-col>
@@ -223,7 +223,7 @@
               <span>{{ formData.contactName || "--" }}</span>
             </div>
             <el-form-item label-width="100px" label="紧急联系人" v-else>
-              <el-input v-model="formData.contactName" placeholder="请输入" clearable></el-input>
+              <el-input v-model.trim="formData.contactName" placeholder="请输入" clearable></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -232,7 +232,7 @@
               <span>{{ formData.contactMobile || "--" }}</span>
             </div>
             <el-form-item label-width="100px" label="联系人电话" v-else>
-              <el-input v-model="formData.contactMobile" placeholder="请输入" clearable></el-input>
+              <el-input v-model.trim="formData.contactMobile" placeholder="请输入" clearable></el-input>
             </el-form-item>
           </el-col>
         </el-row>
@@ -244,7 +244,7 @@
               <span>{{ formData.remark || "--" }}</span>
             </div>
             <el-form-item label-width="100px" label="备注" class="wd-wr" v-else>
-              <el-input v-model="formData.remark" placeholder="请输入" clearable></el-input>
+              <el-input v-model.trim="formData.remark" placeholder="请输入" clearable></el-input>
             </el-form-item>
           </el-col>
         </el-row>
diff --git a/src/views/modules/base/residentManagement/resiDisability/resiDisability.vue b/src/views/modules/base/residentManagement/resiDisability/resiDisability.vue
index 1beea1baa..54b10f6ab 100644
--- a/src/views/modules/base/residentManagement/resiDisability/resiDisability.vue
+++ b/src/views/modules/base/residentManagement/resiDisability/resiDisability.vue
@@ -4,36 +4,36 @@
       <div class="m-search">
         <el-form :inline="true" :model="formData" ref="ref_searchform" :label-width="'100px'">
           <el-form-item label="姓名">
-            <el-input v-model="formData.name" placeholder="请输入" size="small" class="u-item-width-normal"
+            <el-input v-model.trim="formData.name" placeholder="请输入" size="small" class="u-item-width-normal"
               clearable></el-input>
           </el-form-item>
           <el-form-item label="联系电话">
-            <el-input v-model="formData.mobile" placeholder="请输入" size="small" class="u-item-width-normal"
+            <el-input v-model.trim="formData.mobile" placeholder="请输入" size="small" class="u-item-width-normal"
               clearable></el-input>
           </el-form-item>
           <el-form-item label="证件号">
-            <el-input v-model="formData.idNum" placeholder="请输入" size="small" class="u-item-width-normal"
+            <el-input v-model.trim="formData.idNum" placeholder="请输入" size="small" class="u-item-width-normal"
               clearable></el-input>
           </el-form-item>
           <el-form-item label="性别">
-            <el-select v-model="formData.gender" placeholder="请输入" size="small" class="u-item-width-normal" clearable>
+            <el-select v-model.trim="formData.gender" placeholder="请输入" size="small" class="u-item-width-normal" clearable>
               <el-option v-for="item in genderList" :key="item.value" :label="item.label" :value="item.value">
               </el-option>
             </el-select>
           </el-form-item>
           <el-form-item label="本地户籍">
-            <el-select v-model="formData.localResidenceFlag" placeholder="请输入" size="small" class="u-item-width-normal"
+            <el-select v-model.trim="formData.localResidenceFlag" placeholder="请输入" size="small" class="u-item-width-normal"
               clearable>
               <el-option v-for="item in binaryOptionList" :key="item.value" :label="item.label" :value="item.value">
               </el-option>
             </el-select>
           </el-form-item>
           <el-form-item label="居住地址">
-            <el-input v-model="formData.currentResidence" placeholder="请输入" size="small" class="u-item-width-normal"
+            <el-input v-model.trim="formData.currentResidence" placeholder="请输入" size="small" class="u-item-width-normal"
               clearable></el-input>
           </el-form-item>
           <el-form-item label="残疾类别">
-            <el-select v-model="formData.disabilityCategoryCode" placeholder="请选择" size="small"
+            <el-select v-model.trim="formData.disabilityCategoryCode" placeholder="请选择" size="small"
               class="u-item-width-normal" clearable>
               <el-option v-for="item in dicts.disability_category_code" :key="item.value" :label="item.label"
                 :value="item.value">
@@ -41,37 +41,37 @@
             </el-select>
           </el-form-item>
           <el-form-item label="残疾级别">
-            <el-select v-model="formData.disabilityLevel" placeholder="请选择" size="small" class="u-item-width-normal"
+            <el-select v-model.trim="formData.disabilityLevel" placeholder="请选择" size="small" class="u-item-width-normal"
               clearable>
               <el-option v-for="item in dicts.disability_level" :key="item.value" :label="item.label" :value="item.value">
               </el-option>
             </el-select>
           </el-form-item>
           <el-form-item label="残疾证号">
-            <el-input v-model="formData.disabilityNum" placeholder="请输入" size="small" class="u-item-width-normal"
+            <el-input v-model.trim="formData.disabilityNum" placeholder="请输入" size="small" class="u-item-width-normal"
               clearable></el-input>
           </el-form-item>
           <el-form-item label="低保">
-            <el-select v-model="formData.subsistenceAllowanceFlag" placeholder="请选择" size="small"
+            <el-select v-model.trim="formData.subsistenceAllowanceFlag" placeholder="请选择" size="small"
               class="u-item-width-normal" clearable>
               <el-option v-for="item in binaryOptionList" :key="item.value" :label="item.label" :value="item.value">
               </el-option>
             </el-select>
           </el-form-item>
           <el-form-item label="月收入">
-            <el-input v-model="formData.monthIncome" placeholder="请输入" size="small" class="u-item-width-normal"
+            <el-input v-model.trim="formData.monthIncome" placeholder="请输入" size="small" class="u-item-width-normal"
               clearable></el-input>
           </el-form-item>
           <el-form-item label="紧急联系人">
-            <el-input v-model="formData.contactName" placeholder="请输入" size="small" class="u-item-width-normal"
+            <el-input v-model.trim="formData.contactName" placeholder="请输入" size="small" class="u-item-width-normal"
               clearable></el-input>
           </el-form-item>
           <el-form-item label="联系人电话">
-            <el-input v-model="formData.contactMobile" placeholder="请输入" size="small" class="u-item-width-normal"
+            <el-input v-model.trim="formData.contactMobile" placeholder="请输入" size="small" class="u-item-width-normal"
               clearable></el-input>
           </el-form-item>
           <el-form-item label="备注">
-            <el-input v-model="formData.remark" placeholder="请输入" size="small" class="u-item-width-normal"
+            <el-input v-model.trim="formData.remark" placeholder="请输入" size="small" class="u-item-width-normal"
               clearable></el-input>
           </el-form-item>
           <el-row type="flex">
diff --git a/src/views/modules/base/residentManagement/subsistenceAllowance/addForm.vue b/src/views/modules/base/residentManagement/subsistenceAllowance/addForm.vue
index 8a4d9c603..5b9a15a34 100644
--- a/src/views/modules/base/residentManagement/subsistenceAllowance/addForm.vue
+++ b/src/views/modules/base/residentManagement/subsistenceAllowance/addForm.vue
@@ -9,7 +9,7 @@
               <span>{{ formData.agencyName || "--" }}</span>
             </div>
             <el-form-item v-else label="所属组织" label-width="100px" prop="agencyId">
-              <el-cascader v-if="formType == 'add'" ref="ref_cascader_agency" class="width-two" v-model="selGridId"
+              <el-cascader v-if="formType == 'add'" ref="ref_cascader_agency" class="width-two" v-model.trim="selGridId"
                 :options="optionsA" @change="handleChangeAngency"
                 :props="{ checkStrictly: true, emitPath: false, children: 'subAgencyList', label: 'agencyName', value: 'agencyId' }"
                 clearable />
@@ -27,7 +27,7 @@
               <span>{{ formData.name || "--" }}</span>
             </div>
             <el-form-item label-width="100px" label="姓名" prop="name" v-else>
-              <el-input v-model="formData.name" placeholder="请输入" clearable></el-input>
+              <el-input v-model.trim="formData.name" placeholder="请输入" clearable></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -36,7 +36,7 @@
               <span>{{ formData.mobile || "--" }}</span>
             </div>
             <el-form-item label-width="100px" label="联系电话" v-else>
-              <el-input v-model="formData.mobile" placeholder="请输入" clearable></el-input>
+              <el-input v-model.trim="formData.mobile" placeholder="请输入" clearable></el-input>
             </el-form-item>
           </el-col>
         </el-row>
@@ -48,7 +48,7 @@
               <span>{{ formData.idTypeName || "--" }}</span>
             </div>
             <el-form-item label-width="100px" label="证件类型" prop="idType" v-else>
-              <el-select v-model="formData.idType" clearable>
+              <el-select v-model.trim="formData.idType" clearable>
                 <el-option v-for="item in dicts.idCard_type" :key="item.value" :label="item.label" :value="item.value">
                 </el-option>
               </el-select>
@@ -60,7 +60,7 @@
               <span>{{ formData.idNum || "--" }}</span>
             </div>
             <el-form-item label-width="100px" label="证件号" prop="idNum" v-else>
-              <el-input v-model="formData.idNum" placeholder="请输入" clearable></el-input>
+              <el-input v-model.trim="formData.idNum" placeholder="请输入" clearable></el-input>
             </el-form-item>
           </el-col>
         </el-row>
@@ -72,7 +72,7 @@
               <span>{{ formData.birthday || '--' }}</span>
             </div>
             <el-form-item label-width="100px" label="出生日期" v-else>
-              <el-date-picker v-model="formData.birthday" type="date" value-format="yyyy-MM-dd HH:mm:ss"
+              <el-date-picker v-model.trim="formData.birthday" type="date" value-format="yyyy-MM-dd HH:mm:ss"
                 placeholder="选择日期" style="width: 202px" clearable>
               </el-date-picker>
             </el-form-item>
@@ -91,7 +91,7 @@
               }}</span>
             </div>
             <el-form-item label-width="100px" label="性别" v-else>
-              <el-select v-model="formData.gender" clearable>
+              <el-select v-model.trim="formData.gender" clearable>
                 <el-option v-for="item in genderList" :key="item.value" :label="item.label" :value="item.value">
                 </el-option>
               </el-select>
@@ -105,7 +105,7 @@
               <span>{{ formData.nationName || "--" }}</span>
             </div>
             <el-form-item label-width="100px" label="民族" v-else>
-              <el-select v-model="formData.nation" clearable>
+              <el-select v-model.trim="formData.nation" clearable>
                 <el-option v-for="item in dicts.nationList" :key="item.value" :label="item.label" :value="item.value">
                 </el-option>
               </el-select>
@@ -125,7 +125,7 @@
               }}</span>
             </div>
             <el-form-item label-width="100px" label="本地户籍" v-else>
-              <el-select v-model="formData.localResidenceFlag" clearable>
+              <el-select v-model.trim="formData.localResidenceFlag" clearable>
                 <el-option v-for="item in binaryOptionList" :key="item.value" :label="item.label" :value="item.value">
                 </el-option>
               </el-select>
@@ -140,7 +140,7 @@
               <span>{{ formData.placeOfDomicile || "--" }}</span>
             </div>
             <el-form-item label-width="100px" label="户籍地址" class="wd-wr" v-else>
-              <el-input v-model="formData.placeOfDomicile" placeholder="请输入" clearable></el-input>
+              <el-input v-model.trim="formData.placeOfDomicile" placeholder="请输入" clearable></el-input>
             </el-form-item>
           </el-col>
         </el-row>
@@ -153,7 +153,7 @@
               <span>{{ formData.currentResidence || "--" }}</span>
             </div>
             <el-form-item label-width="100px" label="现居地址" class="wd-wr" v-else>
-              <el-input v-model="formData.currentResidence" placeholder="请输入" clearable></el-input>
+              <el-input v-model.trim="formData.currentResidence" placeholder="请输入" clearable></el-input>
             </el-form-item>
           </el-col>
         </el-row>
@@ -165,7 +165,7 @@
               <span>{{ formData.bankAccount || "--" }}</span>
             </div>
             <el-form-item label-width="100px" label="银行卡号" v-else>
-              <el-input v-model="formData.bankAccount" placeholder="请输入" clearable></el-input>
+              <el-input v-model.trim="formData.bankAccount" placeholder="请输入" clearable></el-input>
             </el-form-item>
           </el-col>
 
@@ -180,7 +180,7 @@
             </div>
             <el-form-item label-width="100px" label="退休金额" v-else>
               <!-- @blur="checkRetirementAmountNumberInput" -->
-              <el-input v-model="formData.retirementAmount"   placeholder="请输入" clearable></el-input>
+              <el-input v-model.trim="formData.retirementAmount"   placeholder="请输入" clearable></el-input>
             </el-form-item>
           </el-col>
         </el-row>
@@ -192,7 +192,7 @@
             </div>
             <el-form-item label-width="100px" label="月收入" v-else>
               <!-- @blur="checkmonthIncomeNumberInput" -->
-              <el-input v-model="formData.monthIncome"  placeholder="请输入" clearable></el-input>
+              <el-input v-model.trim="formData.monthIncome"  placeholder="请输入" clearable></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -201,7 +201,7 @@
               <span>{{ formData.workUnit || "--" }}</span>
             </div>
             <el-form-item label-width="100px" label="工作单位" v-else>
-              <el-input v-model="formData.workUnit" placeholder="请输入" clearable></el-input>
+              <el-input v-model.trim="formData.workUnit" placeholder="请输入" clearable></el-input>
             </el-form-item>
           </el-col>
         </el-row>
@@ -213,7 +213,7 @@
               <span>{{ formData.occupation || "--" }}</span>
             </div>
             <el-form-item label-width="100px" label="职业" v-else>
-              <el-input v-model="formData.occupation" placeholder="请输入" clearable></el-input>
+              <el-input v-model.trim="formData.occupation" placeholder="请输入" clearable></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -222,7 +222,7 @@
               <span>{{ formData.retireTime || '--' }}</span>
             </div>
             <el-form-item label-width="100px" label="离退休时间" v-else>
-              <el-date-picker v-model="formData.retireTime" type="date" value-format="yyyy-MM-dd" placeholder="选择日期"
+              <el-date-picker v-model.trim="formData.retireTime" type="date" value-format="yyyy-MM-dd" placeholder="选择日期"
                 style="width: 202px" clearable>
               </el-date-picker>
             </el-form-item>
@@ -236,7 +236,7 @@
               <span>{{ formData.remark || "--" }}</span>
             </div>
             <el-form-item label-width="100px" label="备注" class="wd-wr" v-else>
-              <el-input v-model="formData.remark" placeholder="请输入" clearable></el-input>
+              <el-input v-model.trim="formData.remark" placeholder="请输入" clearable></el-input>
             </el-form-item>
           </el-col>
         </el-row>
diff --git a/src/views/modules/base/residentManagement/subsistenceAllowance/subsistenceAllowance.vue b/src/views/modules/base/residentManagement/subsistenceAllowance/subsistenceAllowance.vue
index 4d0291afd..13a05ed9e 100644
--- a/src/views/modules/base/residentManagement/subsistenceAllowance/subsistenceAllowance.vue
+++ b/src/views/modules/base/residentManagement/subsistenceAllowance/subsistenceAllowance.vue
@@ -4,37 +4,37 @@
       <div class="m-search">
         <el-form :inline="true" :model="formData" ref="ref_searchform" :label-width="'100px'">
           <el-form-item label="姓名">
-            <el-input v-model="formData.name" placeholder="请输入" size="small" class="u-item-width-normal"
+            <el-input v-model.trim="formData.name" placeholder="请输入" size="small" class="u-item-width-normal"
               clearable></el-input>
           </el-form-item>
           <el-form-item label="联系电话">
-            <el-input v-model="formData.mobile" placeholder="请输入" size="small" class="u-item-width-normal"
+            <el-input v-model.trim="formData.mobile" placeholder="请输入" size="small" class="u-item-width-normal"
               clearable></el-input>
           </el-form-item>
           <el-form-item label="证件号">
-            <el-input v-model="formData.idNum" placeholder="请输入" size="small" class="u-item-width-normal"
+            <el-input v-model.trim="formData.idNum" placeholder="请输入" size="small" class="u-item-width-normal"
               clearable></el-input>
           </el-form-item>
           <el-form-item label="性别">
-            <el-select v-model="formData.gender" placeholder="请输入" size="small" class="u-item-width-normal" clearable>
+            <el-select v-model.trim="formData.gender" placeholder="请输入" size="small" class="u-item-width-normal" clearable>
               <el-option v-for="item in genderList" :key="item.value" :label="item.label" :value="item.value">
               </el-option>
             </el-select>
           </el-form-item>
           <el-form-item label="本地户籍">
-            <el-select v-model="formData.localResidenceFlag" placeholder="请输入" size="small" class="u-item-width-normal"
+            <el-select v-model.trim="formData.localResidenceFlag" placeholder="请输入" size="small" class="u-item-width-normal"
               clearable>
               <el-option v-for="item in binaryOptionList" :key="item.value" :label="item.label" :value="item.value">
               </el-option>
             </el-select>
           </el-form-item>
           <el-form-item label="居住地址">
-            <el-input v-model="formData.currentResidence" placeholder="请输入" size="small" class="u-item-width-normal"
+            <el-input v-model.trim="formData.currentResidence" placeholder="请输入" size="small" class="u-item-width-normal"
               clearable></el-input>
           </el-form-item>
 
           <el-form-item label="低保">
-            <el-select v-model="formData.subsistenceAllowanceFlag" placeholder="请选择" size="small"
+            <el-select v-model.trim="formData.subsistenceAllowanceFlag" placeholder="请选择" size="small"
               class="u-item-width-normal" clearable>
               <el-option v-for="item in binaryOptionList" :key="item.value" :label="item.label" :value="item.value">
               </el-option>
@@ -42,7 +42,7 @@
           </el-form-item>
 
           <el-form-item label="备注">
-            <el-input v-model="formData.remark" placeholder="请输入" size="small" class="u-item-width-normal"
+            <el-input v-model.trim="formData.remark" placeholder="请输入" size="small" class="u-item-width-normal"
               clearable></el-input>
           </el-form-item>
           <el-row type="flex">
diff --git a/src/views/modules/base/residentManagement/tefu/addForm.vue b/src/views/modules/base/residentManagement/tefu/addForm.vue
index 5c1628247..b75c67a3d 100644
--- a/src/views/modules/base/residentManagement/tefu/addForm.vue
+++ b/src/views/modules/base/residentManagement/tefu/addForm.vue
@@ -22,7 +22,7 @@
               <el-cascader v-if="formType == 'add'"
                            ref="ref_cascader_agency"
                            class="width-two"
-                           v-model=" selGridId"
+                           v-model.trim=" selGridId"
                            :options="optionsA"
                            @change="handleChangeAngency"
                            :props="{ checkStrictly: true, emitPath: false,children:'subAgencyList',label:'agencyName',value:'agencyId'}"
@@ -46,7 +46,7 @@
                           label="姓名"
                           prop="name"
                           v-else>
-              <el-input v-model="formData.name"
+              <el-input v-model.trim="formData.name"
                         placeholder="请输入"
                         clearable></el-input>
             </el-form-item>
@@ -60,7 +60,7 @@
             <el-form-item :label-width="labelWidth"
                           label="联系电话"
                           v-else>
-              <el-input v-model="formData.mobile"
+              <el-input v-model.trim="formData.mobile"
                         placeholder="请输入"
                         clearable></el-input>
             </el-form-item>
@@ -78,7 +78,7 @@
                           label="证件类型"
                           prop="idType"
                           v-else>
-              <el-select v-model="formData.idType"
+              <el-select v-model.trim="formData.idType"
                          clearable>
                 <el-option v-for="item in idTypeList"
                            :key="item.value"
@@ -98,7 +98,7 @@
                           label="证件号"
                           prop="idNum"
                           v-else>
-              <el-input v-model="formData.idNum"
+              <el-input v-model.trim="formData.idNum"
                         placeholder="请输入"
                         clearable></el-input>
             </el-form-item>
@@ -115,7 +115,7 @@
             <el-form-item :label-width="labelWidth"
                           label="出生日期"
                           v-else>
-              <el-date-picker v-model="formData.birthday"
+              <el-date-picker v-model.trim="formData.birthday"
                               type="date"
                               value-format="yyyy-MM-dd HH:mm:ss"
                               placeholder="选择日期"
@@ -141,7 +141,7 @@
             <el-form-item :label-width="labelWidth"
                           label="性别"
                           v-else>
-              <el-select v-model="formData.gender"
+              <el-select v-model.trim="formData.gender"
                          clearable>
                 <el-option v-for="item in genderList"
                            :key="item.value"
@@ -162,7 +162,7 @@
             <el-form-item :label-width="labelWidth"
                           label="民族"
                           v-else>
-              <el-select v-model="formData.nation"
+              <el-select v-model.trim="formData.nation"
                          clearable>
                 <el-option v-for="item in dicts.nationList"
                            :key="item.value"
@@ -189,7 +189,7 @@
             <el-form-item :label-width="labelWidth"
                           label="本地户籍"
                           v-else>
-              <el-select v-model="formData.localResidenceFlag"
+              <el-select v-model.trim="formData.localResidenceFlag"
                          clearable>
                 <el-option v-for="item in binaryOptionList"
                            :key="item.value"
@@ -212,7 +212,7 @@
                           label="户籍地址"
                           class="wd-wr"
                           v-else>
-              <el-input v-model="formData.placeOfDomicile"
+              <el-input v-model.trim="formData.placeOfDomicile"
                         placeholder="请输入"
                         clearable></el-input>
             </el-form-item>
@@ -230,7 +230,7 @@
                           label="现居地址"
                           class="wd-wr"
                           v-else>
-              <el-input v-model="formData.currentResidence"
+              <el-input v-model.trim="formData.currentResidence"
                         placeholder="请输入"
                         clearable></el-input>
             </el-form-item>
@@ -247,7 +247,7 @@
             <el-form-item :label-width="labelWidth"
                           label="婚姻状况"
                           v-else>
-              <el-select v-model="formData.marriage"
+              <el-select v-model.trim="formData.marriage"
                          placeholder="请输入"
                          size="small"
                          class="u-item-width-normal"
@@ -269,7 +269,7 @@
             <el-form-item :label-width="labelWidth"
                           label="银行卡号"
                           v-else>
-              <el-input v-model="formData.bankAccount"
+              <el-input v-model.trim="formData.bankAccount"
                         placeholder="请输入"
                         clearable></el-input>
             </el-form-item>
@@ -286,7 +286,7 @@
                           label="备注"
                           class="wd-wr"
                           v-else>
-              <el-input v-model="formData.remark"
+              <el-input v-model.trim="formData.remark"
                         placeholder="请输入"
                         clearable></el-input>
             </el-form-item>
@@ -302,7 +302,7 @@
             <el-form-item :label-width="labelWidth"
                           label="特扶类别"
                           v-else>
-              <el-select v-model="formData.specialSupportType"
+              <el-select v-model.trim="formData.specialSupportType"
                          clearable>
                 <el-option v-for="item in specialSupportTypeList"
                            :key="item.value"
@@ -326,7 +326,7 @@
             <el-form-item :label-width="labelWidth"
                           label="子女姓名"
                           v-else>
-              <el-input v-model="formData.childName"
+              <el-input v-model.trim="formData.childName"
                         placeholder="请输入"
                         clearable></el-input>
             </el-form-item>
@@ -349,7 +349,7 @@
             <el-form-item :label-width="labelWidth"
                           label="子女性别"
                           v-else>
-              <el-select v-model="formData.childGender"
+              <el-select v-model.trim="formData.childGender"
                          clearable>
                 <el-option v-for="item in genderList"
                            :key="item.value"
@@ -369,7 +369,7 @@
             <el-form-item :label-width="labelWidth"
                           label="子女死亡日期"
                           v-else>
-              <el-date-picker v-model="formData.childDeathDate"
+              <el-date-picker v-model.trim="formData.childDeathDate"
                               type="date"
                               value-format="yyyy-MM-dd"
                               placeholder="选择日期"
@@ -390,7 +390,7 @@
             <el-form-item :label-width="labelWidth"
                           label="伤残类别"
                           v-else>
-              <el-select v-model="formData.childDisabilityCategoryCode"
+              <el-select v-model.trim="formData.childDisabilityCategoryCode"
                          clearable>
                 <el-option v-for="item in dicts.childDisabilityCategoryCodeList"
                            :key="item.value"
@@ -409,7 +409,7 @@
             <el-form-item :label-width="labelWidth"
                           label="伤残等级"
                           v-else>
-              <el-select v-model="formData.childDisabilityLevel"
+              <el-select v-model.trim="formData.childDisabilityLevel"
                          clearable>
                 <el-option v-for="item in dicts.childDisabilityLevelList"
                            :key="item.value"
diff --git a/src/views/modules/base/residentManagement/tefu/tefuList.vue b/src/views/modules/base/residentManagement/tefu/tefuList.vue
index 8e120a136..351bf6e92 100644
--- a/src/views/modules/base/residentManagement/tefu/tefuList.vue
+++ b/src/views/modules/base/residentManagement/tefu/tefuList.vue
@@ -8,21 +8,21 @@
                  :label-width="'100px'">
 
           <el-form-item label="姓名">
-            <el-input v-model="formData.name"
+            <el-input v-model.trim="formData.name"
                       placeholder="请输入"
                       size="small"
                       class="u-item-width-normal"
                       clearable></el-input>
           </el-form-item>
           <el-form-item label="联系电话">
-            <el-input v-model="formData.mobile"
+            <el-input v-model.trim="formData.mobile"
                       placeholder="请输入"
                       size="small"
                       class="u-item-width-normal"
                       clearable></el-input>
           </el-form-item>
           <el-form-item label="证件号">
-            <el-input v-model="formData.idNum"
+            <el-input v-model.trim="formData.idNum"
                       placeholder="请输入"
                       size="small"
                       class="u-item-width-normal"
@@ -30,7 +30,7 @@
           </el-form-item>
 
           <el-form-item label="本地户籍">
-            <el-select v-model="formData.localResidenceFlag"
+            <el-select v-model.trim="formData.localResidenceFlag"
                        placeholder="请输入"
                        size="small"
                        class="u-item-width-normal"
@@ -44,7 +44,7 @@
           </el-form-item>
 
           <el-form-item label="现居地址">
-            <el-input v-model="formData.currentResidence"
+            <el-input v-model.trim="formData.currentResidence"
                       placeholder="请输入"
                       size="small"
                       class="u-item-width-normal"
@@ -52,7 +52,7 @@
           </el-form-item>
 
           <el-form-item label="婚姻状况">
-            <el-select v-model="formData.marriage"
+            <el-select v-model.trim="formData.marriage"
                        placeholder="请输入"
                        size="small"
                        class="u-item-width-normal"
@@ -66,7 +66,7 @@
           </el-form-item>
 
           <el-form-item label="银行卡号">
-            <el-input v-model="formData.bankAccount"
+            <el-input v-model.trim="formData.bankAccount"
                       placeholder="请输入"
                       size="small"
                       class="u-item-width-normal"
@@ -78,7 +78,7 @@
             <el-cascader class="u-item-width-normal"
                          size="small"
                          ref="ref_cascader_agency"
-                         v-model="formData.agencyId"
+                         v-model.trim="formData.agencyId"
                          :options="optionsA"
                          @change="handleChangeAgency"
                          :props="{ checkStrictly: true, emitPath: false,children:'subAgencyList',label:'agencyName',value:'agencyId'}"
diff --git a/src/views/modules/base/residentManagement/unemployment/addForm.vue b/src/views/modules/base/residentManagement/unemployment/addForm.vue
index afb74f74a..7625f40ad 100644
--- a/src/views/modules/base/residentManagement/unemployment/addForm.vue
+++ b/src/views/modules/base/residentManagement/unemployment/addForm.vue
@@ -9,7 +9,7 @@
               <span>{{ formData.agencyName || "--" }}</span>
             </div>
             <el-form-item v-else label="所属组织" label-width="100px" prop="agencyId">
-              <el-cascader v-if="formType == 'add'" ref="ref_cascader_agency" class="width-two" v-model="selGridId"
+              <el-cascader v-if="formType == 'add'" ref="ref_cascader_agency" class="width-two" v-model.trim="selGridId"
                 :options="optionsA" @change="handleChangeAngency"
                 :props="{ checkStrictly: true, emitPath: false, children: 'subAgencyList', label: 'agencyName', value: 'agencyId' }"
                 clearable />
@@ -27,7 +27,7 @@
               <span>{{ formData.name || "--" }}</span>
             </div>
             <el-form-item label-width="100px" label="姓名" prop="name" v-else>
-              <el-input v-model="formData.name" placeholder="请输入" clearable></el-input>
+              <el-input v-model.trim="formData.name" placeholder="请输入" clearable></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -36,7 +36,7 @@
               <span>{{ formData.mobile || "--" }}</span>
             </div>
             <el-form-item label-width="100px" label="联系电话" v-else>
-              <el-input v-model="formData.mobile" placeholder="请输入" clearable></el-input>
+              <el-input v-model.trim="formData.mobile" placeholder="请输入" clearable></el-input>
             </el-form-item>
           </el-col>
         </el-row>
@@ -48,7 +48,7 @@
               <span>{{ formData.idTypeName || "--" }}</span>
             </div>
             <el-form-item label-width="100px" label="证件类型" prop="idType" v-else>
-              <el-select v-model="formData.idType" clearable>
+              <el-select v-model.trim="formData.idType" clearable>
                 <el-option v-for="item in dicts.idCard_type" :key="item.value" :label="item.label" :value="item.value">
                 </el-option>
               </el-select>
@@ -60,7 +60,7 @@
               <span>{{ formData.idNum || "--" }}</span>
             </div>
             <el-form-item label-width="100px" label="证件号" prop="idNum" v-else>
-              <el-input v-model="formData.idNum" placeholder="请输入" clearable></el-input>
+              <el-input v-model.trim="formData.idNum" placeholder="请输入" clearable></el-input>
             </el-form-item>
           </el-col>
         </el-row>
@@ -72,7 +72,7 @@
               <span>{{ formData.birthday || "--" }}</span>
             </div>
             <el-form-item label-width="100px" label="出生日期" v-else>
-              <el-date-picker v-model="formData.birthday" type="date" value-format="yyyy-MM-dd HH:mm:ss"
+              <el-date-picker v-model.trim="formData.birthday" type="date" value-format="yyyy-MM-dd HH:mm:ss"
                 placeholder="选择日期" style="width: 202px" clearable>
               </el-date-picker>
             </el-form-item>
@@ -91,7 +91,7 @@
               }}</span>
             </div>
             <el-form-item label-width="100px" label="性别" v-else>
-              <el-select v-model="formData.gender" clearable>
+              <el-select v-model.trim="formData.gender" clearable>
                 <el-option v-for="item in genderList" :key="item.value" :label="item.label" :value="item.value">
                 </el-option>
               </el-select>
@@ -106,7 +106,7 @@
               <span>{{ formData.nationName || "--" }}</span>
             </div>
             <el-form-item label-width="100px" label="民族" v-else>
-              <el-select v-model="formData.nation" clearable>
+              <el-select v-model.trim="formData.nation" clearable>
                 <el-option v-for="item in dicts.nationList" :key="item.value" :label="item.label" :value="item.value">
                 </el-option>
               </el-select>
@@ -126,7 +126,7 @@
               }}</span>
             </div>
             <el-form-item label-width="100px" label="本地户籍" v-else>
-              <el-select v-model="formData.localResidenceFlag" clearable>
+              <el-select v-model.trim="formData.localResidenceFlag" clearable>
                 <el-option v-for="item in binaryOptionList" :key="item.value" :label="item.label" :value="item.value">
                 </el-option>
               </el-select>
@@ -141,7 +141,7 @@
               <span>{{ formData.placeOfDomicile || "--" }}</span>
             </div>
             <el-form-item label-width="100px" label="户籍地址" class="wd-wr" v-else>
-              <el-input v-model="formData.placeOfDomicile" placeholder="请输入" clearable></el-input>
+              <el-input v-model.trim="formData.placeOfDomicile" placeholder="请输入" clearable></el-input>
             </el-form-item>
           </el-col>
         </el-row>
@@ -153,7 +153,7 @@
               <span>{{ formData.currentResidence || "--" }}</span>
             </div>
             <el-form-item label-width="100px" label="现居地址" class="wd-wr" v-else>
-              <el-input v-model="formData.currentResidence" placeholder="请输入" clearable></el-input>
+              <el-input v-model.trim="formData.currentResidence" placeholder="请输入" clearable></el-input>
             </el-form-item>
           </el-col>
         </el-row>
@@ -165,7 +165,7 @@
               <span>{{ formData.cultureLevelName || "--" }}</span>
             </div>
             <el-form-item label-width="100px" label="文化程度" v-else>
-              <el-select v-model="formData.cultureLevel" clearable>
+              <el-select v-model.trim="formData.cultureLevel" clearable>
                 <el-option v-for="item in dicts.educationList" :key="item.value" :label="item.label" :value="item.value">
                 </el-option>
               </el-select>
@@ -185,7 +185,7 @@
               }}</span>
             </div>
             <el-form-item label-width="100px" label="是否残疾" v-else>
-              <el-select v-model="formData.disabilityFlag" clearable>
+              <el-select v-model.trim="formData.disabilityFlag" clearable>
                 <el-option v-for="item in disabilityFlagList" :key="item.value" :label="item.label" :value="item.value">
                 </el-option>
               </el-select>
@@ -199,7 +199,7 @@
               <span>{{ formData.disabilityCategoryName || "--" }}</span>
             </div>
             <el-form-item label-width="100px" label="残疾类别" v-else>
-              <el-select v-model="formData.disabilityCategoryCode" clearable>
+              <el-select v-model.trim="formData.disabilityCategoryCode" clearable>
                 <el-option v-for="item in dicts.disability_category_code" :key="item.value" :label="item.label"
                   :value="item.value">
                 </el-option>
@@ -212,7 +212,7 @@
               <span>{{ formData.disabilityLevelName || "--" }}</span>
             </div>
             <el-form-item label-width="100px" label="伤残等级" v-else>
-              <el-select v-model="formData.disabilityLevel" clearable>
+              <el-select v-model.trim="formData.disabilityLevel" clearable>
                 <el-option v-for="item in dicts.disability_level" :key="item.value" :label="item.label"
                   :value="item.value">
                 </el-option>
@@ -227,7 +227,7 @@
               <span>{{ formData.originWorkUnit || "--" }}</span>
             </div>
             <el-form-item label-width="100px" label="原工作单位" v-else>
-              <el-input v-model="formData.originWorkUnit" placeholder="请输入" clearable></el-input>
+              <el-input v-model.trim="formData.originWorkUnit" placeholder="请输入" clearable></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="12"> </el-col>
@@ -239,7 +239,7 @@
               <span>{{ formData.unemploymentTime || "--" }}</span>
             </div>
             <el-form-item label-width="100px" label="失业时间" v-else>
-              <el-date-picker v-model="formData.unemploymentTime" type="date" value-format="yyyy-MM-dd" placeholder="选择日期"
+              <el-date-picker v-model.trim="formData.unemploymentTime" type="date" value-format="yyyy-MM-dd" placeholder="选择日期"
                 style="width: 202px" clearable>
               </el-date-picker>
             </el-form-item>
@@ -250,7 +250,7 @@
               <span>{{ formData.unemploymentNum || "--" }}</span>
             </div>
             <el-form-item label-width="100px" label="失业证号" v-else>
-              <el-input v-model="formData.unemploymentNum" placeholder="请输入" clearable></el-input>
+              <el-input v-model.trim="formData.unemploymentNum" placeholder="请输入" clearable></el-input>
             </el-form-item>
           </el-col>
         </el-row>
@@ -261,7 +261,7 @@
               <span>{{ formData.unemploymentReasonName || "--" }}</span>
             </div>
             <el-form-item label-width="100px" label="失业原因" v-else>
-              <el-select v-model="formData.unemploymentReason" clearable>
+              <el-select v-model.trim="formData.unemploymentReason" clearable>
                 <el-option v-for="item in dicts.unemployment_cause" :key="item.value" :label="item.label"
                   :value="item.value">
                 </el-option>
@@ -274,7 +274,7 @@
               <span>{{ formData.employmentNum || "--" }}</span>
             </div>
             <el-form-item label-width="100px" label="再就业优惠证号" v-else>
-              <el-input v-model="formData.employmentNum" clearable> </el-input>
+              <el-input v-model.trim="formData.employmentNum" clearable> </el-input>
             </el-form-item>
           </el-col>
         </el-row>
@@ -285,7 +285,7 @@
               <span>{{ formData.specialSkill || "--" }}</span>
             </div>
             <el-form-item label-width="100px" label="技术特长" v-else>
-              <el-input v-model="formData.specialSkill" placeholder="请输入" clearable></el-input>
+              <el-input v-model.trim="formData.specialSkill" placeholder="请输入" clearable></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -302,7 +302,7 @@
               }}</span>
             </div>
             <el-form-item label-width="100px" label="是否领取失业金" v-else>
-              <el-select v-model="formData.unempCompensationFlag" clearable>
+              <el-select v-model.trim="formData.unempCompensationFlag" clearable>
                 <el-option v-for="item in binaryOptionList" :key="item.value" :label="item.label" :value="item.value">
                 </el-option>
               </el-select>
@@ -325,7 +325,7 @@
               }}</span>
             </div>
             <el-form-item label-width="100px" label="是否就业困难对象" v-else>
-              <el-select v-model="formData.employmentHardFlag" clearable>
+              <el-select v-model.trim="formData.employmentHardFlag" clearable>
                 <el-option v-for="item in binaryOptionList" :key="item.value" :label="item.label" :value="item.value">
                 </el-option>
               </el-select>
@@ -337,7 +337,7 @@
               <span>{{ formData.employmentWishName || "--" }}</span>
             </div>
             <el-form-item label-width="100px" label="劳动能力就业愿景" v-else>
-              <el-select v-model="formData.employmentWish" clearable>
+              <el-select v-model.trim="formData.employmentWish" clearable>
                 <el-option v-for="item in dicts.career_goals" :key="item.value" :label="item.label" :value="item.value">
                 </el-option>
               </el-select>
@@ -352,7 +352,7 @@
               <span>{{ formData.remark || "--" }}</span>
             </div>
             <el-form-item label-width="100px" label="备注" class="wd-wr" v-else>
-              <el-input v-model="formData.remark" placeholder="请输入" clearable></el-input>
+              <el-input v-model.trim="formData.remark" placeholder="请输入" clearable></el-input>
             </el-form-item>
           </el-col>
         </el-row>
diff --git a/src/views/modules/base/residentManagement/unemployment/unemployment.vue b/src/views/modules/base/residentManagement/unemployment/unemployment.vue
index cae770725..786e7b7a6 100644
--- a/src/views/modules/base/residentManagement/unemployment/unemployment.vue
+++ b/src/views/modules/base/residentManagement/unemployment/unemployment.vue
@@ -6,69 +6,69 @@
           ">
           <el-form :inline="true" :model="formData" ref="ref_searchform" :label-width="'100px'">
             <el-form-item label="姓名">
-              <el-input v-model="formData.name" placeholder="请输入" size="small" class="u-item-width-normal"
+              <el-input v-model.trim="formData.name" placeholder="请输入" size="small" class="u-item-width-normal"
                 clearable></el-input>
             </el-form-item>
             <el-form-item label="联系电话">
-              <el-input v-model="formData.mobile" placeholder="请输入" size="small" class="u-item-width-normal"
+              <el-input v-model.trim="formData.mobile" placeholder="请输入" size="small" class="u-item-width-normal"
                 clearable></el-input>
             </el-form-item>
             <el-form-item label="证件号">
-              <el-input v-model="formData.idNum" placeholder="请输入" size="small" class="u-item-width-normal"
+              <el-input v-model.trim="formData.idNum" placeholder="请输入" size="small" class="u-item-width-normal"
                 clearable></el-input>
             </el-form-item>
             <el-form-item label="文化程度">
-              <el-select v-model="formData.cultureLevel" placeholder="请选择" size="small" class="u-item-width-normal"
+              <el-select v-model.trim="formData.cultureLevel" placeholder="请选择" size="small" class="u-item-width-normal"
                 clearable>
                 <el-option v-for="item in dicts.educationList" :key="item.value" :label="item.label" :value="item.value">
                 </el-option>
               </el-select>
             </el-form-item>
             <el-form-item label="出生日期">
-              <el-date-picker v-model="formData.birthdayStart" type="date" size="small" class="u-item-width-daterange"
+              <el-date-picker v-model.trim="formData.birthdayStart" type="date" size="small" class="u-item-width-daterange"
                 value-format="yyyy-MM-dd" placeholder="开始日期" :picker-options="startPickerOptions">
               </el-date-picker>
               <span class="u-data-tag">至</span>
-              <el-date-picker v-model="formData.birthdayEnd" type="date" size="small" value-format="yyyy-MM-dd"
+              <el-date-picker v-model.trim="formData.birthdayEnd" type="date" size="small" value-format="yyyy-MM-dd"
                 class="u-item-width-daterange u-data-tag" placeholder="结束日期" :picker-options="endPickerOptionsBirthday">
               </el-date-picker>
             </el-form-item>
             <el-form-item label="是否残疾">
-              <el-select v-model="formData.disabilityFlag" placeholder="请输入" size="small" class="u-item-width-normal"
+              <el-select v-model.trim="formData.disabilityFlag" placeholder="请输入" size="small" class="u-item-width-normal"
                 clearable>
                 <el-option v-for="item in disabilityFlagList" :key="item.value" :label="item.label" :value="item.value">
                 </el-option>
               </el-select>
             </el-form-item>
             <el-form-item label="居住地址">
-              <el-input v-model="formData.currentResidence" placeholder="请输入" size="small" class="u-item-width-normal"
+              <el-input v-model.trim="formData.currentResidence" placeholder="请输入" size="small" class="u-item-width-normal"
                 clearable></el-input>
             </el-form-item>
             <el-form-item label="失业时间">
-              <el-date-picker v-model="formData.unemploymentTimeStart" type="date" size="small"
+              <el-date-picker v-model.trim="formData.unemploymentTimeStart" type="date" size="small"
                 class="u-item-width-daterange" value-format="yyyy-MM-dd" placeholder="开始日期"
                 :picker-options="startPickerOptions">
               </el-date-picker>
               <span class="u-data-tag">至</span>
-              <el-date-picker v-model="formData.unemploymentTimeEnd" type="date" size="small" value-format="yyyy-MM-dd"
+              <el-date-picker v-model.trim="formData.unemploymentTimeEnd" type="date" size="small" value-format="yyyy-MM-dd"
                 class="u-item-width-daterange u-data-tag" placeholder="结束日期"
                 :picker-options="endPickerOptionsUnemployment">
               </el-date-picker>
             </el-form-item>
             <el-form-item label="失业证号">
-              <el-input v-model="formData.unemploymentNum" placeholder="请输入" size="small" class="u-item-width-normal"
+              <el-input v-model.trim="formData.unemploymentNum" placeholder="请输入" size="small" class="u-item-width-normal"
                 clearable></el-input>
             </el-form-item>
             <el-form-item label="再就业优惠证号">
-              <el-input v-model="formData.employmentNum" placeholder="请输入" size="small" class="u-item-width-normal"
+              <el-input v-model.trim="formData.employmentNum" placeholder="请输入" size="small" class="u-item-width-normal"
                 clearable></el-input>
             </el-form-item>
             <el-form-item label="技术特长">
-              <el-input v-model="formData.specialSkill" placeholder="请输入" size="small" class="u-item-width-normal"
+              <el-input v-model.trim="formData.specialSkill" placeholder="请输入" size="small" class="u-item-width-normal"
                 clearable></el-input>
             </el-form-item>
             <el-form-item label="失业原因">
-              <el-select v-model="formData.unemploymentReason" placeholder="请选择" size="small" class="u-item-width-normal"
+              <el-select v-model.trim="formData.unemploymentReason" placeholder="请选择" size="small" class="u-item-width-normal"
                 clearable>
                 <el-option v-for="item in dicts.unemployment_reason" :key="item.value" :label="item.label"
                   :value="item.value">
@@ -76,7 +76,7 @@
               </el-select>
             </el-form-item>
             <el-form-item label="是否领取失业金">
-              <el-select v-model="formData.unempCompensationFlag" placeholder="请输入" size="small"
+              <el-select v-model.trim="formData.unempCompensationFlag" placeholder="请输入" size="small"
                 class="u-item-width-normal" clearable>
                 <el-option v-for="item in binaryOptionList" :key="item.value" :label="item.label" :value="item.value">
                 </el-option>
@@ -84,18 +84,18 @@
             </el-form-item>
 
             <el-form-item label="是否就业困难对象">
-              <el-select v-model="formData.employmentHardFlag" placeholder="请选择" size="small" class="u-item-width-normal"
+              <el-select v-model.trim="formData.employmentHardFlag" placeholder="请选择" size="small" class="u-item-width-normal"
                 clearable>
                 <el-option v-for="item in binaryOptionList" :key="item.value" :label="item.label" :value="item.value">
                 </el-option>
               </el-select>
             </el-form-item>
             <el-form-item label="劳动能力就业愿望">
-              <el-input v-model="formData.employmentWish" placeholder="请输入" size="small" class="u-item-width-normal"
+              <el-input v-model.trim="formData.employmentWish" placeholder="请输入" size="small" class="u-item-width-normal"
                 clearable></el-input>
             </el-form-item>
             <el-form-item label="备注">
-              <el-input v-model="formData.remark" placeholder="请输入" size="small" class="u-item-width-normal"
+              <el-input v-model.trim="formData.remark" placeholder="请输入" size="small" class="u-item-width-normal"
                 clearable></el-input>
             </el-form-item>
           </el-form>
diff --git a/src/views/modules/base/residentManagement/veteran/addForm.vue b/src/views/modules/base/residentManagement/veteran/addForm.vue
index b64f75e0f..5d31bf071 100644
--- a/src/views/modules/base/residentManagement/veteran/addForm.vue
+++ b/src/views/modules/base/residentManagement/veteran/addForm.vue
@@ -9,7 +9,7 @@
               <span>{{ formData.agencyName || "--" }}</span>
             </div>
             <el-form-item v-else label="所属组织" label-width="100px" prop="agencyId">
-              <el-cascader v-if="formType == 'add'" ref="ref_cascader_agency" class="width-two" v-model="selGridId"
+              <el-cascader v-if="formType == 'add'" ref="ref_cascader_agency" class="width-two" v-model.trim="selGridId"
                 :options="optionsA" @change="handleChangeAngency"
                 :props="{ checkStrictly: true, emitPath: false, children: 'subAgencyList', label: 'agencyName', value: 'agencyId' }"
                 clearable />
@@ -27,7 +27,7 @@
               <span>{{ formData.name || "--" }}</span>
             </div>
             <el-form-item label-width="100px" label="姓名" prop="name" v-else>
-              <el-input v-model="formData.name" placeholder="请输入" clearable></el-input>
+              <el-input v-model.trim="formData.name" placeholder="请输入" clearable></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -36,7 +36,7 @@
               <span>{{ formData.mobile || "--" }}</span>
             </div>
             <el-form-item label-width="100px" label="联系电话" v-else>
-              <el-input v-model="formData.mobile" placeholder="请输入" clearable></el-input>
+              <el-input v-model.trim="formData.mobile" placeholder="请输入" clearable></el-input>
             </el-form-item>
           </el-col>
         </el-row>
@@ -48,7 +48,7 @@
               <span>{{ formData.idTypeName || "--" }}</span>
             </div>
             <el-form-item label-width="100px" label="证件类型" prop="idType" clearable v-else>
-              <el-select v-model="formData.idType" clearable>
+              <el-select v-model.trim="formData.idType" clearable>
                 <el-option v-for="item in dicts.idCard_type" :key="item.value" :label="item.label" :value="item.value">
                 </el-option>
               </el-select>
@@ -60,7 +60,7 @@
               <span>{{ formData.idNum || "--" }}</span>
             </div>
             <el-form-item label-width="100px" label="证件号" prop="idNum" v-else>
-              <el-input v-model="formData.idNum" placeholder="请输入" clearable></el-input>
+              <el-input v-model.trim="formData.idNum" placeholder="请输入" clearable></el-input>
             </el-form-item>
           </el-col>
         </el-row>
@@ -71,7 +71,7 @@
               <span>{{ formData.birthday || "--" }}</span>
             </div>
             <el-form-item label-width="100px" label="出生日期" v-else>
-              <el-date-picker v-model="formData.birthday" type="date" value-format="yyyy-MM-dd HH:mm:ss"
+              <el-date-picker v-model.trim="formData.birthday" type="date" value-format="yyyy-MM-dd HH:mm:ss"
                 placeholder="选择日期" style="width: 202px" clearable>
               </el-date-picker>
             </el-form-item>
@@ -90,7 +90,7 @@
               }}</span>
             </div>
             <el-form-item label-width="100px" label="性别" v-else>
-              <el-select v-model="formData.gender" clearable>
+              <el-select v-model.trim="formData.gender" clearable>
                 <el-option v-for="item in genderList" :key="item.value" :label="item.label" :value="item.value">
                 </el-option>
               </el-select>
@@ -106,7 +106,7 @@
             </div>
             <el-form-item label-width="100px" label="民族" class="wd-wr" v-else>
               <template>
-                <el-select v-model="formData.nation" placeholder="请选择" clearable>
+                <el-select v-model.trim="formData.nation" placeholder="请选择" clearable>
                   <el-option v-for="item in dicts.nationList" :label="item.label" :value="item.value" :key="item.value">
                   </el-option>
                 </el-select>
@@ -128,7 +128,7 @@
             </div>
             <el-form-item label-width="100px" label="政治面貌" class="wd-wr" v-else>
               <template>
-                <el-select v-model="formData.politicsStatus" placeholder="请选择" clearable>
+                <el-select v-model.trim="formData.politicsStatus" placeholder="请选择" clearable>
                   <el-option v-for="item in politicsStatusList" :label="item.label" :value="item.value" :key="item.value">
                   </el-option>
                 </el-select>
@@ -145,7 +145,7 @@
             </div>
             <el-form-item label-width="100px" label="文化程度" class="wd-wr" v-else>
               <template>
-                <el-select v-model="formData.cultureLevel" placeholder="请选择" clearable>
+                <el-select v-model.trim="formData.cultureLevel" placeholder="请选择" clearable>
                   <el-option v-for="item in dicts.educationList" :label="item.label" :value="item.value"
                     :key="item.value">
                   </el-option>
@@ -160,7 +160,7 @@
             </div>
             <el-form-item label-width="100px" label="婚姻状况" class="wd-wr" v-else>
               <template>
-                <el-select v-model="formData.marriage" placeholder="请选择" clearable>
+                <el-select v-model.trim="formData.marriage" placeholder="请选择" clearable>
                   <el-option v-for="item in dicts.marriageList" :label="item.label" :value="item.value" :key="item.value">
                   </el-option>
                 </el-select>
@@ -177,7 +177,7 @@
             </div>
             <el-form-item label-width="100px" label="本地户籍" class="wd-wr" v-else>
               <template>
-                <el-select v-model="formData.localResidenceFlag" placeholder="请选择" clearable>
+                <el-select v-model.trim="formData.localResidenceFlag" placeholder="请选择" clearable>
                   <el-option v-for="item in binaryOptionList" :label="item.label" :value="item.value" :key="item.value">
                   </el-option>
                 </el-select>
@@ -193,7 +193,7 @@
               <span>{{ formData.placeOfDomicile || "--" }}</span>
             </div>
             <el-form-item label-width="100px" label="户籍地址" class="wd-wr" v-else>
-              <el-input v-model="formData.placeOfDomicile" placeholder="请输入" clearable></el-input>
+              <el-input v-model.trim="formData.placeOfDomicile" placeholder="请输入" clearable></el-input>
             </el-form-item>
           </el-col>
         </el-row>
@@ -205,7 +205,7 @@
               <span>{{ formData.currentResidence || "--" }}</span>
             </div>
             <el-form-item label-width="100px" label="现居地址" class="wd-wr" v-else>
-              <el-input v-model="formData.currentResidence" placeholder="请输入" clearable></el-input>
+              <el-input v-model.trim="formData.currentResidence" placeholder="请输入" clearable></el-input>
             </el-form-item>
           </el-col>
         </el-row>
@@ -217,7 +217,7 @@
               <span>{{ formData.joinArmyTime || "--" }}</span>
             </div>
             <el-form-item label-width="100px" label="入伍日期" v-else>
-              <el-date-picker v-model="formData.joinArmyTime" type="date" value-format="yyyy-MM-dd" placeholder="选择日期"
+              <el-date-picker v-model.trim="formData.joinArmyTime" type="date" value-format="yyyy-MM-dd" placeholder="选择日期"
                 style="width: 202px" clearable>
               </el-date-picker>
             </el-form-item>
@@ -228,7 +228,7 @@
               <span>{{ formData.leaveArmyTime || "--" }}</span>
             </div>
             <el-form-item label-width="100px" label="退伍日期" v-else>
-              <el-date-picker v-model="formData.leaveArmyTime" type="date" value-format="yyyy-MM-dd" placeholder="选择日期"
+              <el-date-picker v-model.trim="formData.leaveArmyTime" type="date" value-format="yyyy-MM-dd" placeholder="选择日期"
                 style="width: 202px" clearable>
               </el-date-picker>
             </el-form-item>
@@ -242,7 +242,7 @@
               <span>{{ formData.serviceUnit || "--" }}</span>
             </div>
             <el-form-item label-width="100px" label="服役单位" v-else>
-              <el-input v-model="formData.serviceUnit" placeholder="请输入" clearable></el-input>
+              <el-input v-model.trim="formData.serviceUnit" placeholder="请输入" clearable></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -251,7 +251,7 @@
               <span>{{ formData.receiveUnit || "--" }}</span>
             </div>
             <el-form-item label-width="100px" label="接收单位" v-else>
-              <el-input v-model="formData.receiveUnit" placeholder="请输入" clearable></el-input>
+              <el-input v-model.trim="formData.receiveUnit" placeholder="请输入" clearable></el-input>
             </el-form-item>
           </el-col>
         </el-row>
@@ -264,12 +264,12 @@
                 {{ formData.joinWarEndTime || "--" }}</span>
             </div>
             <el-form-item label-width="100px" label="参战日期" v-else>
-              <el-date-picker v-model="formData.joinWarStartTime" type="date" class="u-item-width-daterange"
+              <el-date-picker v-model.trim="formData.joinWarStartTime" type="date" class="u-item-width-daterange"
                 value-format="yyyy-MM-dd" placeholder="开始日期" :picker-options="startPickerOptions" style="width: 259px"
                 clearable>
               </el-date-picker>
               <span class="u-data-tag">至</span>
-              <el-date-picker v-model="formData.joinWarEndTime" type="date" value-format="yyyy-MM-dd"
+              <el-date-picker v-model.trim="formData.joinWarEndTime" type="date" value-format="yyyy-MM-dd"
                 class="u-item-width-daterange u-data-tag" placeholder="结束日期" :picker-options="endPickerOptionsJoinWar"
                 style="width: 259px" clearable>
               </el-date-picker>
@@ -284,7 +284,7 @@
               <span>{{ formData.employmentSituation || "--" }}</span>
             </div>
             <el-form-item label-width="100px" label="现就业情况" v-else>
-              <el-input v-model="formData.employmentSituation" placeholder="请输入" clearable></el-input>
+              <el-input v-model.trim="formData.employmentSituation" placeholder="请输入" clearable></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -293,7 +293,7 @@
               <span>{{ formData.settlementAmount || "--" }}</span>
             </div>
             <el-form-item label-width="105px" label="待安置补助金" v-else>
-              <el-input v-model="formData.settlementAmount" placeholder="请输入" clearable></el-input>
+              <el-input v-model.trim="formData.settlementAmount" placeholder="请输入" clearable></el-input>
             </el-form-item>
           </el-col>
         </el-row>
@@ -305,7 +305,7 @@
               <span>{{ formData.trainDesc || "--" }}</span>
             </div>
             <el-form-item label-width="100px" label="培训状况" v-else>
-              <el-input v-model="formData.trainDesc" placeholder="请输入" clearable></el-input>
+              <el-input v-model.trim="formData.trainDesc" placeholder="请输入" clearable></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -315,7 +315,7 @@
             </div>
             <el-form-item label-width="100px" label="是否办理公益性岗位" v-else>
               <template>
-                <el-select v-model="formData.pubWelfareJobFlag" placeholder="请选择" clearable>
+                <el-select v-model.trim="formData.pubWelfareJobFlag" placeholder="请选择" clearable>
                   <el-option v-for="item in binaryOptionList" :label="item.label" :value="item.value" :key="item.value">
                   </el-option>
                 </el-select>
@@ -331,7 +331,7 @@
               <span>{{ formData.workUnit || "--" }}</span>
             </div>
             <el-form-item label-width="100px" label="现工作单位" class="wd-wr" v-else>
-              <el-input v-model="formData.workUnit" placeholder="请输入" clearable></el-input>
+              <el-input v-model.trim="formData.workUnit" placeholder="请输入" clearable></el-input>
             </el-form-item>
           </el-col>
         </el-row>
@@ -342,7 +342,7 @@
               <span>{{ formData.remark || "--" }}</span>
             </div>
             <el-form-item label-width="100px" label="备注" class="wd-wr" v-else>
-              <el-input v-model="formData.remark" placeholder="请输入" clearable></el-input>
+              <el-input v-model.trim="formData.remark" placeholder="请输入" clearable></el-input>
             </el-form-item>
           </el-col>
         </el-row>
diff --git a/src/views/modules/base/residentManagement/veteran/veteran.vue b/src/views/modules/base/residentManagement/veteran/veteran.vue
index f057c5ac6..c997a3295 100644
--- a/src/views/modules/base/residentManagement/veteran/veteran.vue
+++ b/src/views/modules/base/residentManagement/veteran/veteran.vue
@@ -6,101 +6,101 @@
           ">
           <el-form :inline="true" :model="formData" ref="ref_searchform" :label-width="'100px'">
             <el-form-item label="姓名">
-              <el-input v-model="formData.name" placeholder="请输入" size="small" class="u-item-width-normal"
+              <el-input v-model.trim="formData.name" placeholder="请输入" size="small" class="u-item-width-normal"
                 clearable></el-input>
             </el-form-item>
             <el-form-item label="联系电话">
-              <el-input v-model="formData.mobile" placeholder="请输入" size="small" class="u-item-width-normal"
+              <el-input v-model.trim="formData.mobile" placeholder="请输入" size="small" class="u-item-width-normal"
                 clearable></el-input>
             </el-form-item>
             <el-form-item label="证件号">
-              <el-input v-model="formData.idNum" placeholder="请输入" size="small" class="u-item-width-normal"
+              <el-input v-model.trim="formData.idNum" placeholder="请输入" size="small" class="u-item-width-normal"
                 clearable></el-input>
             </el-form-item>
             <el-form-item label="居住地址">
-              <el-input v-model="formData.currentResidence" placeholder="请输入" size="small" class="u-item-width-normal"
+              <el-input v-model.trim="formData.currentResidence" placeholder="请输入" size="small" class="u-item-width-normal"
                 clearable></el-input>
             </el-form-item>
             <el-form-item label="出生日期">
-              <el-date-picker v-model="formData.birthdayStartTime" type="date" size="small" class="u-item-width-daterange"
+              <el-date-picker v-model.trim="formData.birthdayStartTime" type="date" size="small" class="u-item-width-daterange"
                 value-format="yyyy-MM-dd" placeholder="开始日期" :picker-options="startPickerOptions">
               </el-date-picker>
               <span class="u-data-tag">至</span>
-              <el-date-picker v-model="formData.birthdayEndTime" type="date" size="small" value-format="yyyy-MM-dd"
+              <el-date-picker v-model.trim="formData.birthdayEndTime" type="date" size="small" value-format="yyyy-MM-dd"
                 class="u-item-width-daterange u-data-tag" placeholder="结束日期" :picker-options="endPickerOptionsBirthday">
               </el-date-picker>
             </el-form-item>
             <el-form-item label="性别">
-              <el-select v-model="formData.gender" placeholder="请输入" size="small" class="u-item-width-normal" clearable>
+              <el-select v-model.trim="formData.gender" placeholder="请输入" size="small" class="u-item-width-normal" clearable>
                 <el-option v-for="item in genderList" :key="item.value" :label="item.label" :value="item.value">
                 </el-option>
               </el-select>
             </el-form-item>
             <el-form-item label="民族">
-              <el-select v-model="formData.nation" placeholder="请选择" size="small" class="u-item-width-normal" clearable>
+              <el-select v-model.trim="formData.nation" placeholder="请选择" size="small" class="u-item-width-normal" clearable>
                 <el-option v-for="item in dicts.nationList" :key="item.value" :label="item.label" :value="item.value">
                 </el-option>
               </el-select>
             </el-form-item>
             <el-form-item label="政治面貌">
-              <el-select v-model="formData.politicsStatus" placeholder="请输入" size="small" class="u-item-width-normal"
+              <el-select v-model.trim="formData.politicsStatus" placeholder="请输入" size="small" class="u-item-width-normal"
                 clearable>
                 <el-option v-for="item in politicsStatusList" :key="item.value" :label="item.label" :value="item.value">
                 </el-option>
               </el-select>
             </el-form-item>
             <el-form-item label="文化程度">
-              <el-select v-model="formData.education" placeholder="请选择" size="small" class="u-item-width-normal"
+              <el-select v-model.trim="formData.education" placeholder="请选择" size="small" class="u-item-width-normal"
                 clearable>
                 <el-option v-for="item in dicts.educationList" :key="item.value" :label="item.label" :value="item.value">
                 </el-option>
               </el-select>
             </el-form-item>
             <el-form-item label="服役单位">
-              <el-input v-model="formData.serviceUnit" placeholder="请输入" size="small" class="u-item-width-normal"
+              <el-input v-model.trim="formData.serviceUnit" placeholder="请输入" size="small" class="u-item-width-normal"
                 clearable></el-input>
             </el-form-item>
             <el-form-item label="接收单位">
-              <el-input v-model="formData.receiveUnit" placeholder="请输入" size="small" class="u-item-width-normal"
+              <el-input v-model.trim="formData.receiveUnit" placeholder="请输入" size="small" class="u-item-width-normal"
                 clearable></el-input>
             </el-form-item>
             <el-form-item label="入伍日期">
-              <el-date-picker v-model="formData.joinArmyStartTime" type="date" size="small" class="u-item-width-daterange"
+              <el-date-picker v-model.trim="formData.joinArmyStartTime" type="date" size="small" class="u-item-width-daterange"
                 value-format="yyyy-MM-dd" placeholder="开始日期" :picker-options="startPickerOptions">
               </el-date-picker>
               <span class="u-data-tag">至</span>
-              <el-date-picker v-model="formData.joinArmyEndTime" type="date" size="small" value-format="yyyy-MM-dd"
+              <el-date-picker v-model.trim="formData.joinArmyEndTime" type="date" size="small" value-format="yyyy-MM-dd"
                 class="u-item-width-daterange u-data-tag" placeholder="结束日期" :picker-options="endPickerOptionsJoinArmy">
               </el-date-picker>
             </el-form-item>
             <el-form-item label="退伍日期">
-              <el-date-picker v-model="formData.leaveArmyStartTime" type="date" size="small"
+              <el-date-picker v-model.trim="formData.leaveArmyStartTime" type="date" size="small"
                 class="u-item-width-daterange" value-format="yyyy-MM-dd" placeholder="开始日期"
                 :picker-options="startPickerOptions">
               </el-date-picker>
               <span class="u-data-tag">至</span>
-              <el-date-picker v-model="formData.leaveArmyEndTime" type="date" size="small" value-format="yyyy-MM-dd"
+              <el-date-picker v-model.trim="formData.leaveArmyEndTime" type="date" size="small" value-format="yyyy-MM-dd"
                 class="u-item-width-daterange u-data-tag" placeholder="结束日期" :picker-options="endPickerOptionsLeaveArmy">
               </el-date-picker>
             </el-form-item>
             <el-form-item label="参战日期">
-              <el-date-picker v-model="formData.joinWarStartTime" type="date" size="small" class="u-item-width-daterange"
+              <el-date-picker v-model.trim="formData.joinWarStartTime" type="date" size="small" class="u-item-width-daterange"
                 value-format="yyyy-MM-dd" placeholder="开始日期" :picker-options="startPickerOptions">
               </el-date-picker>
               <span class="u-data-tag">至</span>
-              <el-date-picker v-model="formData.joinWarEndTime" type="date" size="small" value-format="yyyy-MM-dd"
+              <el-date-picker v-model.trim="formData.joinWarEndTime" type="date" size="small" value-format="yyyy-MM-dd"
                 class="u-item-width-daterange u-data-tag" placeholder="结束日期" :picker-options="endPickerOptionsJoinWar">
               </el-date-picker>
             </el-form-item>
             <el-form-item label="是否办理公益岗">
-              <el-select v-model="formData.pubWelfareJobFlag" placeholder="请选择" size="small" class="u-item-width-normal"
+              <el-select v-model.trim="formData.pubWelfareJobFlag" placeholder="请选择" size="small" class="u-item-width-normal"
                 clearable>
                 <el-option v-for="item in binaryOptionList" :key="item.value" :label="item.label" :value="item.value">
                 </el-option>
               </el-select>
             </el-form-item>
             <el-form-item label="备注">
-              <el-input v-model="formData.remark" placeholder="请输入" size="small" class="u-item-width-normal"
+              <el-input v-model.trim="formData.remark" placeholder="请输入" size="small" class="u-item-width-normal"
                 clearable></el-input>
             </el-form-item>
           </el-form>
diff --git a/src/views/modules/base/residentManagement/volunteer/addForm.vue b/src/views/modules/base/residentManagement/volunteer/addForm.vue
index 9317ed98b..9a35b50e5 100644
--- a/src/views/modules/base/residentManagement/volunteer/addForm.vue
+++ b/src/views/modules/base/residentManagement/volunteer/addForm.vue
@@ -10,7 +10,7 @@
               <span>{{ formData.agencyName || "--" }}</span>
             </div>
             <el-form-item v-else label="所属组织" label-width="100px" prop="agencyId">
-              <el-cascader v-if="formType == 'add'" ref="ref_cascader_agency" class="width-two" v-model="selGridId"
+              <el-cascader v-if="formType == 'add'" ref="ref_cascader_agency" class="width-two" v-model.trim="selGridId"
                 :options="optionsA" @change="handleChangeAngency"
                 :props="{ checkStrictly: true, emitPath: false, children: 'subAgencyList', label: 'agencyName', value: 'agencyId' }"
                 clearable />
@@ -28,7 +28,7 @@
               <span>{{ formData.name || "--" }}</span>
             </div>
             <el-form-item label-width="100px" label="姓名" prop="name" v-else>
-              <el-input v-model="formData.name" placeholder="请输入" clearable></el-input>
+              <el-input v-model.trim="formData.name" placeholder="请输入" clearable></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -37,7 +37,7 @@
               <span>{{ formData.mobile || "--" }}</span>
             </div>
             <el-form-item label-width="100px" label="联系电话" v-else>
-              <el-input v-model="formData.mobile" placeholder="请输入" clearable></el-input>
+              <el-input v-model.trim="formData.mobile" placeholder="请输入" clearable></el-input>
             </el-form-item>
           </el-col>
         </el-row>
@@ -49,7 +49,7 @@
               <span>{{ formData.idTypeName || "--" }}</span>
             </div>
             <el-form-item label-width="100px" label="证件类型" prop="idType" v-else>
-              <el-select v-model="formData.idType" clearable>
+              <el-select v-model.trim="formData.idType" clearable>
                 <el-option v-for="item in dicts.idCard_type" :key="item.value" :label="item.label" :value="item.value">
                 </el-option>
               </el-select>
@@ -61,7 +61,7 @@
               <span>{{ formData.idNum || "--" }}</span>
             </div>
             <el-form-item label-width="100px" label="证件号" prop="idNum" v-else>
-              <el-input v-model="formData.idNum" placeholder="请输入" clearable></el-input>
+              <el-input v-model.trim="formData.idNum" placeholder="请输入" clearable></el-input>
             </el-form-item>
           </el-col>
         </el-row>
@@ -73,7 +73,7 @@
               <span v-if="formData.birthday">{{ formData.birthday.substr(0, 10) || '--' }}</span>
             </div>
             <el-form-item label-width="100px" label="出生日期" v-else>
-              <el-date-picker v-model="formData.birthday" type="date" value-format="yyyy-MM-dd HH:mm:ss"
+              <el-date-picker v-model.trim="formData.birthday" type="date" value-format="yyyy-MM-dd HH:mm:ss"
                 placeholder="选择日期" style="width: 202px" clearable>
               </el-date-picker>
             </el-form-item>
@@ -92,7 +92,7 @@
               }}</span>
             </div>
             <el-form-item label-width="100px" label="性别" v-else>
-              <el-select v-model="formData.gender" clearable>
+              <el-select v-model.trim="formData.gender" clearable>
                 <el-option v-for="item in genderList" :key="item.value" :label="item.label" :value="item.value">
                 </el-option>
               </el-select>
@@ -106,7 +106,7 @@
               <span>{{ formData.nationName || "--" }}</span>
             </div>
             <el-form-item label-width="100px" label="民族" v-else>
-              <el-select v-model="formData.nation" clearable>
+              <el-select v-model.trim="formData.nation" clearable>
                 <el-option v-for="item in dicts.nationList" :key="item.value" :label="item.label" :value="item.value">
                 </el-option>
               </el-select>
@@ -126,7 +126,7 @@
               }}</span>
             </div>
             <el-form-item label-width="100px" label="本地户籍" v-else>
-              <el-select v-model="formData.localResidenceFlag" clearable>
+              <el-select v-model.trim="formData.localResidenceFlag" clearable>
                 <el-option v-for="item in binaryOptionList" :key="item.value" :label="item.label" :value="item.value">
                 </el-option>
               </el-select>
@@ -140,7 +140,7 @@
               <span>{{ formData.placeOfDomicile || "--" }}</span>
             </div>
             <el-form-item label-width="100px" label="户籍地址" class="wd-wr" v-else>
-              <el-input v-model="formData.placeOfDomicile" placeholder="请输入" clearable></el-input>
+              <el-input v-model.trim="formData.placeOfDomicile" placeholder="请输入" clearable></el-input>
             </el-form-item>
           </el-col>
         </el-row>
@@ -152,7 +152,7 @@
               <span>{{ formData.currentResidence || "--" }}</span>
             </div>
             <el-form-item label-width="100px" label="现居地址" class="wd-wr" v-else>
-              <el-input v-model="formData.currentResidence" placeholder="请输入" clearable></el-input>
+              <el-input v-model.trim="formData.currentResidence" placeholder="请输入" clearable></el-input>
             </el-form-item>
           </el-col>
         </el-row>
@@ -164,7 +164,7 @@
               <span>{{ formData.cultureLevelName || "--" }}</span>
             </div>
             <el-form-item label-width="100px" label="文化程度" v-else>
-              <el-select v-model="formData.cultureLevel" clearable>
+              <el-select v-model.trim="formData.cultureLevel" clearable>
                 <el-option v-for="item in dicts.educationList" :key="item.value" :label="item.label" :value="item.value">
                 </el-option>
               </el-select>
@@ -176,7 +176,7 @@
               <span>{{ formData.workUnit || "--" }}</span>
             </div>
             <el-form-item label-width="100px" label="工作单位" v-else>
-              <el-input v-model="formData.workUnit" placeholder="请输入内容" clearable>
+              <el-input v-model.trim="formData.workUnit" placeholder="请输入内容" clearable>
               </el-input>
             </el-form-item>
           </el-col>
@@ -190,7 +190,7 @@
               }}</span>
             </div>
             <el-form-item label-width="100px" label="志愿者类别" v-else>
-              <el-select v-model="formData.volunteerCategories" placeholder="请选择" size="small" class="u-item-width-normal"
+              <el-select v-model.trim="formData.volunteerCategories" placeholder="请选择" size="small" class="u-item-width-normal"
                 clearable multiple collapse-tags>
                 <el-option v-for="item in dicts.volunteerList" :key="item.value" :label="item.label" :value="item.value">
                 </el-option>
@@ -203,7 +203,7 @@
               <span>{{ formData.occupation || "--" }}</span>
             </div>
             <el-form-item label-width="100px" label="职业" v-else>
-              <el-input v-model="formData.occupation" placeholder="请输入" clearable></el-input>
+              <el-input v-model.trim="formData.occupation" placeholder="请输入" clearable></el-input>
             </el-form-item>
           </el-col>
         </el-row>
@@ -214,7 +214,7 @@
               <span v-if="formData.hobbyNames">{{ formData.hobbyNames.join(',') || "--" }}</span>
             </div>
             <el-form-item label-width="100px" label="兴趣特长" class="wd-wr" v-else>
-              <el-select v-model="formData.hobbyCodes" placeholder="请选择" size="small" class="u-item-width-normal"
+              <el-select v-model.trim="formData.hobbyCodes" placeholder="请选择" size="small" class="u-item-width-normal"
                 clearable multiple collapse-tags>
                 <el-option v-for="item in dicts.hobbyList" :key="item.value" :label="item.label" :value="item.value">
                 </el-option>
@@ -229,7 +229,7 @@
               <span>{{ formData.remark || "--" }}</span>
             </div>
             <el-form-item label-width="100px" label="备注" class="wd-wr" v-else>
-              <el-input v-model="formData.remark" placeholder="请输入" clearable></el-input>
+              <el-input v-model.trim="formData.remark" placeholder="请输入" clearable></el-input>
             </el-form-item>
           </el-col>
         </el-row>
diff --git a/src/views/modules/base/residentManagement/volunteer/volunteer.vue b/src/views/modules/base/residentManagement/volunteer/volunteer.vue
index f511c8489..b9a6c46bd 100644
--- a/src/views/modules/base/residentManagement/volunteer/volunteer.vue
+++ b/src/views/modules/base/residentManagement/volunteer/volunteer.vue
@@ -4,67 +4,67 @@
       <div class="m-search">
         <el-form :inline="true" :model="formData" ref="ref_searchform" :label-width="'100px'">
           <el-form-item label="志愿者类别">
-            <el-select v-model="formData.volunteerCategories" placeholder="请选择" size="small" class="u-item-width-normal"
+            <el-select v-model.trim="formData.volunteerCategories" placeholder="请选择" size="small" class="u-item-width-normal"
               clearable multiple collapse-tags>
               <el-option v-for="item in dicts.volunteerList" :key="item.value" :label="item.label" :value="item.value">
               </el-option>
             </el-select>
           </el-form-item>
           <el-form-item label="姓名">
-            <el-input v-model="formData.name" placeholder="请输入" size="small" class="u-item-width-normal"
+            <el-input v-model.trim="formData.name" placeholder="请输入" size="small" class="u-item-width-normal"
               clearable></el-input>
           </el-form-item>
           <el-form-item label="联系电话">
-            <el-input v-model="formData.mobile" placeholder="请输入" size="small" class="u-item-width-normal"
+            <el-input v-model.trim="formData.mobile" placeholder="请输入" size="small" class="u-item-width-normal"
               clearable></el-input>
           </el-form-item>
           <el-form-item label="证件号">
-            <el-input v-model="formData.idNum" placeholder="请输入" size="small" class="u-item-width-normal"
+            <el-input v-model.trim="formData.idNum" placeholder="请输入" size="small" class="u-item-width-normal"
               clearable></el-input>
           </el-form-item>
           <el-form-item label="年龄">
-            <el-input v-model="formData.ageStart" placeholder="请输入内容" size="small" class="u-item-width-daterange"
+            <el-input v-model.trim="formData.ageStart" placeholder="请输入内容" size="small" class="u-item-width-daterange"
               clearable></el-input>
             <span class="u-data-tag">至</span>
-            <el-input v-model="formData.ageEnd" placeholder="请输入内容" size="small" class="u-item-width-daterange u-data-tag"
+            <el-input v-model.trim="formData.ageEnd" placeholder="请输入内容" size="small" class="u-item-width-daterange u-data-tag"
               clearable></el-input>
           </el-form-item>
           <el-form-item label="性别">
-            <el-select v-model="formData.gender" placeholder="请输入" size="small" class="u-item-width-normal" clearable>
+            <el-select v-model.trim="formData.gender" placeholder="请输入" size="small" class="u-item-width-normal" clearable>
               <el-option v-for="item in genderList" :key="item.value" :label="item.label" :value="item.value">
               </el-option>
             </el-select>
           </el-form-item>
           <el-form-item label="民族">
-            <el-select v-model="formData.nation" placeholder="请选择" size="small" class="u-item-width-normal" clearable>
+            <el-select v-model.trim="formData.nation" placeholder="请选择" size="small" class="u-item-width-normal" clearable>
               <el-option v-for="item in dicts.nationList" :key="item.value" :label="item.label" :value="item.value">
               </el-option>
             </el-select>
           </el-form-item>
           <el-form-item label="文化程度">
-            <el-select v-model="formData.cultureLevel" placeholder="请选择" size="small" class="u-item-width-normal"
+            <el-select v-model.trim="formData.cultureLevel" placeholder="请选择" size="small" class="u-item-width-normal"
               clearable>
               <el-option v-for="item in dicts.educationList" :key="item.value" :label="item.label" :value="item.value">
               </el-option>
             </el-select>
           </el-form-item>
           <el-form-item label="职业">
-            <el-input v-model="formData.occupation" placeholder="请输入" size="small" class="u-item-width-normal"
+            <el-input v-model.trim="formData.occupation" placeholder="请输入" size="small" class="u-item-width-normal"
               clearable></el-input>
           </el-form-item>
           <el-form-item label="兴趣特长">
-            <el-select v-model="formData.hobbyCodes" placeholder="请选择" size="small" class="u-item-width-normal" clearable
+            <el-select v-model.trim="formData.hobbyCodes" placeholder="请选择" size="small" class="u-item-width-normal" clearable
               multiple collapse-tags>
               <el-option v-for="item in dicts.hobbyList" :key="item.value" :label="item.label" :value="item.value">
               </el-option>
             </el-select>
           </el-form-item>
           <el-form-item label="居住地址">
-            <el-input v-model="formData.currentResidence" placeholder="请输入" size="small" class="u-item-width-normal"
+            <el-input v-model.trim="formData.currentResidence" placeholder="请输入" size="small" class="u-item-width-normal"
               clearable></el-input>
           </el-form-item>
           <el-form-item label="备注">
-            <el-input v-model="formData.remark" placeholder="请输入" size="small" class="u-item-width-normal"
+            <el-input v-model.trim="formData.remark" placeholder="请输入" size="small" class="u-item-width-normal"
               clearable></el-input>
           </el-form-item>
           <el-row type="flex">
diff --git a/src/views/modules/base/roomForm.vue b/src/views/modules/base/roomForm.vue
index 49b20c108..a9b0491a3 100644
--- a/src/views/modules/base/roomForm.vue
+++ b/src/views/modules/base/roomForm.vue
@@ -18,7 +18,7 @@
                       label-width="150px"
                       style="display: block">
           <el-select class="item_width_1"
-                     v-model="dataForm.buildingUnitId"
+                     v-model.trim="dataForm.buildingUnitId"
                      placeholder="请选择"
                      clearable>
             <el-option v-for="item in unitList"
@@ -35,7 +35,7 @@
                       style="display: block">
           <el-input class="item_width_1"
                     placeholder="请输入门牌号"
-                    v-model="dataForm.doorName">
+                    v-model.trim="dataForm.doorName">
           </el-input>
         </el-form-item>
         <el-form-item v-if="formType != 'detail'" label="房屋编码"
@@ -45,7 +45,7 @@
           <el-input class="item_width_2"
                     maxlength="50"
                     placeholder="请输入楼栋编码"
-                    v-model="dataForm.coding">
+                    v-model.trim="dataForm.coding">
           
           </el-input>
           <el-button style="margin-left: 10px"
@@ -60,7 +60,7 @@
                         style="display: block">
             <el-input class="item_width_1"
                       maxlength="30"
-                      v-model="dataForm.houseCode">
+                      v-model.trim="dataForm.houseCode">
             </el-input>
           </el-form-item>
           <div v-if="dataForm.houseQrcodeUrl"
@@ -77,7 +77,7 @@
                       prop="realPerson"
                       label-width="150px">
           <el-input-number class="item_width_4"
-                           v-model="dataForm.realPerson"
+                           v-model.trim="dataForm.realPerson"
                            :min="0"
                            :max="9999"
                            label="居住人数"></el-input-number>
@@ -86,7 +86,7 @@
                       prop="houseType"
                       label-width="150px"
                       style="display: block">
-          <el-radio-group v-model="houseType">
+          <el-radio-group v-model.trim="houseType">
 
             <el-radio :label="'1'">楼房</el-radio>
             <el-radio :label="'2'">平房</el-radio>
@@ -98,7 +98,7 @@
                       prop="purpose"
                       label-width="150px"
                       style="display: block">
-          <el-radio-group v-model="purpose">
+          <el-radio-group v-model.trim="purpose">
 
             <el-radio :label="'1'">住宅</el-radio>
             <el-radio :label="'2'">商业</el-radio>
@@ -114,7 +114,7 @@
                       prop="rentFlag"
                       label-width="150px"
                       style="display: block">
-          <el-radio-group v-model="rentFlag">
+          <el-radio-group v-model.trim="rentFlag">
 
             <el-radio :label="1">出租</el-radio>
             <el-radio :label="2">闲置</el-radio>
@@ -131,7 +131,7 @@
           <el-input class="item_width_1"
                     maxlength="30"
                     placeholder="请输入房主姓名"
-                    v-model="dataForm.ownerName">
+                    v-model.trim="dataForm.ownerName">
           </el-input>
         </el-form-item>
         <el-form-item label="联系方式"
@@ -141,7 +141,7 @@
           <el-input class="item_width_1"
                     type='number'
                     placeholder="请输入联系方式"
-                    v-model="dataForm.ownerPhone">
+                    v-model.trim="dataForm.ownerPhone">
           </el-input>
         </el-form-item>
         <el-form-item label="房主证件号"
@@ -150,7 +150,7 @@
                       style="display: block">
           <el-input class="item_width_1"
                     placeholder="请输入房主证件号"
-                    v-model="dataForm.ownerIdCard">
+                    v-model.trim="dataForm.ownerIdCard">
           </el-input>
         </el-form-item>
         <el-form-item label="备注"
@@ -160,7 +160,7 @@
           <el-input class="item_width_1"
                     maxlength="30"
                     placeholder="请输入备注"
-                    v-model="dataForm.remark">
+                    v-model.trim="dataForm.remark">
           </el-input>
         </el-form-item>
       </el-form>
diff --git a/src/views/modules/base/smartImport.vue b/src/views/modules/base/smartImport.vue
deleted file mode 100644
index bc0d46232..000000000
--- a/src/views/modules/base/smartImport.vue
+++ /dev/null
@@ -1,513 +0,0 @@
-<template>
-  <div class="g-main">
-    <div class="m-table">
-      <div class="u-table-btn1">
-        <el-dropdown size="small"
-                     type="primary"
-                     style="margin: 0 10px; height: 30px"
-                     trigger="hover">
-          <el-button type="primary"
-                     size="small">
-            表格导入<i class="el-icon-arrow-down el-icon--right"></i>
-          </el-button>
-          <el-dropdown-menu slot="dropdown">
-            <el-dropdown-item v-for="(item, index) in resiClass"
-                              :key="index"
-                              @click.native="handleImportType(item.value)">
-              {{ item.label }}
-            </el-dropdown-item>
-          </el-dropdown-menu>
-        </el-dropdown>
-        <el-upload :headers="$getElUploadHeaders()"
-                   ref="upload"
-                   class="upload-btn"
-                   action="uploadUlr"
-                   :limit="1"
-                   :accept="'.xls,.xlsx'"
-                   :with-credentials="true"
-                   :show-file-list="false"
-                   :auto-upload="true"
-                   :on-progress="handleProgress"
-                   :on-success="handleExcelSuccess"
-                   :before-upload="beforeExcelUpload"
-                   :http-request="uploadHttpRequest"></el-upload>
-        <el-button class="diy-button--white"
-                   size="small"
-                   style="margin-left: 10px"
-                   @click="handleExportModule()">下载模板</el-button>
-      </div>
-      <div v-if="dataList.length > 0">
-        <el-table ref="ref_table"
-                  :data="dataList"
-                  border
-                  :height="tableHeight"
-                  class="m-table-item"
-                  v-loading="dataListLoading"
-                  style="width: 100%">
-          <el-table-column label="序号"
-                           header-align="center"
-                           align="center"
-                           type="index"
-                           width="100"></el-table-column>
-          <el-table-column prop="userTableHeader"
-                           header-align="center"
-                           align="center"
-                           label="表格信息"
-                           min-width="100">
-            <template slot-scope="scope">
-              {{ scope.row.userTableHeader || "--" }}
-            </template>
-          </el-table-column>
-
-          <el-table-column prop="itemGroupId"
-                           header-align="center"
-                           align="center"
-                           label="平台对应信息"
-                           min-width="110">
-            <template slot-scope="scope">
-              <div>
-                <el-select class="item_width_sel"
-                           v-model="scope.row.itemGroupId"
-                           size="small"
-                           placeholder="请选择">
-                  <el-option v-for="item in groupList"
-                             @click.native="handleSelGroup(scope.$index, item, 'change')"
-                             :key="item.value"
-                             :label="item.label"
-                             :value="item.label">
-                  </el-option>
-                </el-select>
-
-                <el-select class="item_width_sel"
-                           v-model="scope.row.itemId"
-                           size="small"
-                           style="margin-left: 10px"
-                           placeholder="请选择">
-                  <el-option v-for="item in scope.row.itemList"
-                             :key="item.itemId"
-                             :label="item.label"
-                             :value="item.label">
-                  </el-option>
-                </el-select>
-              </div>
-            </template>
-          </el-table-column>
-        </el-table>
-
-        <div ref="divEditBtn"
-             class="m-edit-btn">
-          <el-button type="primary"
-                     size="small"
-                     class="diy-button--blue"
-                     @click="handleComfirm">保 存</el-button>
-        </div>
-      </div>
-      <div class="m-hint"
-           v-else>请先导入表格</div>
-    </div>
-  </div>
-</template>
-
-<script>
-import { requestPost } from "@/js/dai/request";
-import { mapGetters } from "vuex";
-
-export default {
-  data () {
-    return {
-      customerId: "", // 客户id，父组件传
-      customerName: "", // 客户名称，父组件传
-
-      tableParams: {
-        customerId: "",
-      },
-      search: "",
-      dataList: [],
-      dataListLoading: false,
-      total: 0,
-      pageSize:window.localStorage.getItem('pageSize') || 20,
-      pageNo: 0,
-
-      formShow: false,
-      formData: {},
-
-      scopeList: [],
-      dataSyncConfigId: "",
-      importLoading: false,
-
-      groupList: [],
-      sHeight: 100,
-
-      importCode: "",
-      importOption: { exist: {}, notExist: {} },
-
-      fileData: null,
-      resiClass: [],
-
-      importType: "",
-    };
-  },
-
-  computed: {
-    tableHeight () {
-      const h = this.clientHeight - this.sHeight + this.iframeHeigh;
-      const _h = this.clientHeight - this.sHeight;
-      return this.$store.state.inIframe ? h : _h;
-    },
-
-    ...mapGetters(["clientHeight", "iframeHeight"]),
-  },
-  components: {},
-  created () { },
-  watch: {
-    //监听dataList有数据才再让他给高度 解决报找不到dom节点错误
-    "dataList.length": {
-      immediate: true,
-      handler (newVal) {
-        this.$nextTick(() => {
-          if (newVal > 0) {
-            this.sHeight = this.$refs.divEditBtn.offsetHeight + 300;
-          }
-        });
-      },
-    },
-  },
-  async mounted () {
-    await this.loadPersonGroup();
-    this.getResident();
-  },
-  methods: {
-    diaClose () {
-      this.formShow = false;
-    },
-    handleDropdownClick (event) {
-      event.stopPropagation();
-    },
-    async loadPersonGroup () {
-      const url = "/oper/customize/icformitemgroup/list";
-      // const url = 'http://yapi.elinkservice.cn/mock/245/gov/org/isServiceProject/service/serviceScopeTree'
-      let params = {
-        formCode: "resident_base_info",
-        policyFlag: "1",
-      };
-
-      const { data, code, msg } = await requestPost(url, params);
-
-      if (code === 0) {
-        this.groupList = data;
-      } else {
-        this.$message.error(msg);
-      }
-    },
-
-    //选择人员信息第一列下拉框
-    async handleSelGroup (index, item, change) {
-      console.log(index, item, change);
-      const url = "/oper/customize/icformitem/getItemListV2";
-      // const url = 'http://yapi.elinkservice.cn/mock/245/gov/org/isServiceProject/service/serviceScopeTree'
-      let params = {
-        // policyFlag: "1",
-        groupId: item.id,
-      };
-      const { data, code, msg } = await requestPost(url, params);
-
-      if (code === 0) {
-        let oneData = this.dataList[index];
-        if (change == "change") {
-          this.dataList[index].itemId = "";
-        }
-        oneData.itemList = data;
-        this.$set(this.dataList, index, oneData);
-      } else {
-        this.$message.error(msg);
-      }
-    },
-
-    // 加载列表数据
-    async loadData () {
-      this.dataListLoading = true;
-      // const url = 'http://yapi.elinkservice.cn/mock/245/epmetuser/dataSyncConfig/list'
-      const url = "/epmetuser/dataSyncConfig/list";
-
-      this.tableParams = {
-        pageSize: this.pageSize,
-        pageNo: this.pageNo,
-      };
-
-      const { data, code, msg } = await requestPost(url, this.tableParams);
-      this.dataListLoading = false;
-      if (code === 0) {
-        this.total = data.total;
-        this.dataList = data.list;
-        this.dataList.forEach((element) => {
-          element.stateShow = element.switchStatus === "open" ? true : false;
-        });
-      } else {
-        // this.$message.error(msg )
-      }
-    },
-    handleImportType (command) {
-      this.importType = command;
-      this.$refs["upload"].$children[0].$refs.input.click();
-    },
-    handleChangeScope (value) {
-      this.orgIdArray = value;
-      this.scopeList = [];
-      let selArray = this.$refs["myCascader"].getCheckedNodes();
-      // console.log('selArray', selArray)
-
-      selArray.forEach((element, index) => {
-        let obj = {
-          orgId: element.data.agencyId,
-          orgType: element.data.level,
-          orgIdPath: element.path.join(":"),
-        };
-        this.scopeList.push(obj);
-      });
-
-      console.log("this.scopeList", this.scopeList);
-    },
-    async getResident () {
-      try {
-        const { data } = await this.$http.post("sys/dict/data/dictlist", {
-          dictType: "resident_category_import",
-        });
-        this.resiClass = data.data;
-      } catch (error) {
-        console.log(error, "获取居民类别字典");
-      }
-    },
-    async handleExportModule () {
-      let url = "/actual/base/residentBaseInfo/import/download-template";
-
-      let params = {};
-      await this.$http({
-        method: "POST",
-        url,
-        responseType: "blob",
-        data: params,
-      })
-        .then((res) => {
-          const url = window.URL.createObjectURL(new Blob([res.data]));
-          const aLink = document.createElement("a");
-          aLink.style.display = "none";
-          aLink.href = url;
-          aLink.setAttribute("download", "人员导入模板.zip");
-          document.body.appendChild(aLink);
-          aLink.click();
-          document.body.removeChild(aLink);
-          window.URL.revokeObjectURL(url);
-          // // this.download(res.data, title + '.xls')
-          // if (res.headers["content-disposition"]) {
-          // 	let fileName = window.decodeURI(
-          // 		res.headers["content-disposition"]
-          // 			.split(";")[1]
-          // 			.split("=")[1]
-          // 	);
-          // 	console.log("filename", fileName);
-          // 	let blob = new Blob([res.data], {
-          // 		type: "application/vnd.ms-excel",
-          // 	});
-          // 	var url = window.URL.createObjectURL(blob);
-          // 	var aLink = document.createElement("a");
-          // 	aLink.style.display = "none";
-          // 	aLink.href = url;
-          // 	aLink.setAttribute("download", fileName);
-          // 	document.body.appendChild(aLink);
-          // 	aLink.click();
-          // 	document.body.removeChild(aLink); //下载完成移除元素
-          // 	window.URL.revokeObjectURL(url); //释放掉blob对象
-          // } else this.$message.error("下载失败");
-        })
-        .catch((err) => {
-          console.log("err", err);
-          return this.$message.error("网络错误");
-        });
-    },
-    // 上传大图标成功
-    handleExcelSuccess (res, file) {
-      console.log(res, file);
-      if (!res) return;
-      if (res.code === 0 && res.msg === "success") {
-        console.log("resss---ppp", res);
-      } else {
-        this.$message.error(res.msg);
-      }
-    },
-    handleProgress (event, file, fileList) {
-      console.log("percentage", file.percentage);
-    },
-
-    beforeExcelUpload (file) {
-      console.log("file", file);
-      console.log(this.importType);
-
-      const isType = file.type === "application/vnd.ms-excel";
-      const isTypeComputer =
-        file.type ===
-        "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet";
-      const fileType = isType || isTypeComputer;
-      const isLt1M = file.size / 1024 / 1024 < 10;
-      if (!fileType) {
-        this.$message.error("上传文件只能是xls/xlsx格式！");
-      }
-
-      if (!isLt1M) {
-        this.$message.error("上传文件大小不能超过 10MB!");
-      }
-
-      if (!this.importType) {
-        this.$message.error("请选择导入的类别");
-      }
-      return fileType && isLt1M;
-    },
-    async uploadHttpRequest (file) {
-      if (!this.importType) return;
-      this.importLoading = true;
-      this.importBtnTitle = "正在上传中...";
-      const formData = new FormData(); //FormData对象，添加参数只能通过append('key', value)的形式添加
-      formData.append("file", file.file); //添加文件对象
-      formData.append("fileMode", this.importType); //添加文件对象
-      // http://127.0.0.1:4523/mock2/2515967/97869993
-      await this.$http
-        .post("/actual/base/importExcelData/extractExcelHead", formData)
-        .then((res) => {
-          console.log("res-up", res);
-          if (res.data.code == 0) {
-            const { metaListData, fileCode, msg } = res.data.data;
-            this.afterSuccess();
-            this.dataList = metaListData;
-            // 相等于在for循环中写filter过滤,这样写能够以 O(1) 的时间复杂度获取 itemGroupId 匹配的元素。
-            let groupMap = new Map(
-              this.groupList.map((item) => [item.label, item])
-            );
-            for (let i in this.dataList) {
-              this.handleSelGroup(
-                i,
-                groupMap.get(this.dataList[i].itemGroupId)
-              );
-            }
-            this.importCode = fileCode;
-            this.fileData = file;
-          } else {
-            this.$message.error(res.data.msg);
-          }
-        })
-        .catch((err) => {
-          console.log("失败", err);
-          file.onError(); //上传失败的文件会从文件列表中删除
-          this.$message.error("导入失败");
-        });
-      this.importLoading = false;
-      this.importBtnTitle = "导入";
-      this.$refs.upload.clearFiles();
-    },
-
-    async handleComfirm () {
-      this.importLoading = true;
-      this.importBtnTitle = "正在上传中...";
-      const { importOption, importCode, dataList } = this;
-      let obj = dataList.reduce((acc, item) => {
-        if (item.userTableHeader) {
-          acc[item.userTableHeader] = item.itemId;
-        }
-        return acc;
-      }, {});
-      const formData = new FormData();
-      formData.append("columnMateJson", JSON.stringify(obj));
-      formData.append("fileCode", importCode);
-      await this.$http
-        .post("/actual/base/importExcelData/importResiHouseExcel", formData)
-        .then((res) => {
-          console.log("res-up", res);
-          if (res.data.code == 0 && res.data.msg == "success") {
-            // this.upload2(this.fileData, this.importCode);
-            this.afterSuccess();
-          } else this.$message.error(res.data.msg);
-        })
-        .catch((err) => {
-          console.log("失败", err);
-          file.onError(); //上传失败的文件会从文件列表中删除
-          // this.$message.error('导入失败')
-        });
-      this.importLoading = false;
-      this.importBtnTitle = "导入";
-    },
-
-    async upload2 (file, code) {
-      this.importLoading = true;
-      this.importBtnTitle = "正在上传中...";
-      const formData = new FormData(); //FormData对象，添加参数只能通过append('key', value)的形式添加
-      formData.append("file", file.file); //添加文件对象
-      formData.append("code", code); //添加文件对象
-      await this.$http
-        .post("/actual/base/residentBaseInfo/importExcel", formData)
-        .then((res) => {
-          console.log("res-up", res);
-          if (res.data.code == 0 && res.data.msg == "success") {
-            this.afterSuccess();
-          } else this.$message.error(res.data.msg);
-        })
-        .catch((err) => {
-          console.log("失败", err);
-          file.onError(); //上传失败的文件会从文件列表中删除
-          // this.$message.error('导入失败')
-        });
-      this.importLoading = false;
-      this.importBtnTitle = "导入";
-      this.$refs.upload.clearFiles();
-    },
-
-    afterSuccess () {
-      this.$message({
-        showClose: true,
-        dangerouslyUseHTMLString: true,
-        message:
-          "导入中，请到系统管理-<a id='clickA' style='cursor: pointer;'>导入记录</a>中查看进度",
-        duration: 3000,
-      });
-      let than = this;
-      document.getElementById("clickA").addEventListener("click", function () {
-        than.$router.push("/main/importRecord-index");
-      });
-      this.dataList = [];
-      this.importOption = {};
-      this.importCode = "";
-      this.fileData = null;
-    },
-
-    // 取消
-    diaCancel () {
-      this.$emit("cancleBack");
-    },
-  },
-};
-</script>
-
-<style lang="scss" scoped>
-@import "@/assets/scss/modules/management/list-main.scss";
-
-.m-edit-btn {
-  display: flex;
-  margin-top: 20px;
-  margin-right: 16px;
-  justify-content: flex-end;
-  text-align: center;
-}
-
-.item_width_sel {
-  width: 200px;
-}
-
-.m-hint {
-  font-size: 50px;
-  line-height: 300px;
-  text-align: center;
-  color: #aaaaaa;
-}
-::v-deep .upload-btn {
-  .el-button {
-    padding: 7px 20px;
-  }
-}
-</style>
diff --git a/src/views/modules/base/smartImport/cpts/completeTask.vue b/src/views/modules/base/smartImport/cpts/completeTask.vue
new file mode 100644
index 000000000..494d87d82
--- /dev/null
+++ b/src/views/modules/base/smartImport/cpts/completeTask.vue
@@ -0,0 +1,247 @@
+<template>
+  <div class="">
+    <div class="content_box">
+      <div class="left">
+        <i class="el-icon-success" style="font-size: 50px; color: #1cc58c"></i>
+        <p>导入完成</p>
+        <el-button
+          style="margin-left: 10px"
+          size="small"
+          type="primary"
+          @click="handelClickBackList"
+          >返回任务列表</el-button
+        >
+      </div>
+      <div class="right">
+        <h4>
+          <el-icon
+            class="el-icon-warning-outline"
+            style="color: #0056d6; font-size: 18px; font-weight: 600"
+          ></el-icon>
+          操作说明
+        </h4>
+        <p>1、可以到居民信息中查看本次导入的数据。</p>
+        <p>2、您可以下载导入失败的数据，按错误提示更正后新建任务再次导入。</p>
+      </div>
+    </div>
+    <h3 class="title-small">数据导入明细</h3>
+    <el-row type="flex" justify="">
+      <el-col :span="24">
+      <i class="el-icon-circle-check" style="color: #1cc58c; font-size: 15px;font-weight: 600;"></i>   {{ this.importSuccessNum || "--" }}条数据已导入。<el-button
+          type="text"
+          @click="handelClickLook('success')"
+          >查看</el-button
+        >
+      </el-col>
+    </el-row>
+    <el-row type="flex" justify="">
+      <el-col :span="24">
+        <i class="el-icon-circle-close" style="color: #ff5b5d;font-size: 15px;font-weight: 600;"></i> {{ this.importFailNum || "--" }}条问题数据导入失败。<el-button
+          type="text"
+          @click="handelClickLook('fail')"
+          >查看</el-button
+        >
+        <i class="el-icon-download" style="margin-left: 16px;"></i>
+        <el-button
+        v-if="this.importFailNum>0"
+              type="text"
+              @click="handelClickDownFile"
+              >下载导入失败数据</el-button
+            >
+      </el-col>
+    </el-row>
+    <el-dialog
+      title="导入结果明细"
+      :visible.sync="showTable"
+      width="50%"
+      v-if="showTable"
+    >
+      <el-table
+        :data="tableData"
+        row-key="fileCode"
+        border
+        style="width: 100%; height: 500px; overflow-y: auto"
+      >
+        <el-table-column
+          v-for="item in tableHeader"
+          :key="item.columnName"
+          :prop="item.columnName"
+          :label="item.label"
+          :align="item.align"
+          show-overflow-tooltip
+        >
+          <template slot-scope="scope">
+            <span>{{ handleFilterSpan(scope.row, item) }}</span>
+          </template>
+        </el-table-column>
+      </el-table>
+      <el-pagination
+        :current-page="pageNo"
+        :page-size="pageSize"
+        :total="total"
+        layout=" prev, pager, next"
+        @current-change="pageCurrentChangeHandle">
+      </el-pagination>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="showTable = false">取 消</el-button>
+        <el-button type="primary" @click="showTable = false">确 定</el-button>
+      </span>
+    </el-dialog>
+  </div>
+</template>
+      <script>
+import { requestPost } from "@/js/dai/request";
+import axios from "axios";
+export default {
+  data() {
+    return {
+      resident_category_import_list: [],
+      showTable: false,
+      tableHeader: [],
+      tableData: [],
+      importSuccessNum: null,
+      importFailNum: null,
+      importCategory:null,
+      pageNo:1,
+      pageSize:20,
+      total:0,
+      tableType:null,
+      resultDescFilePath:null,
+      originFileName:null,
+    };
+  },
+  props: {
+    fileCode: {
+      type: String,
+      default: "",
+    },
+    fileCodeRow: {
+      type: String,
+      default: "",
+    },
+  },
+  created() {
+    this.getTaskInfo();
+  },
+  methods: {
+    handleFilterSpan(row, item) {
+      let _val = "";
+      if (item.options && item.options.length > 0) {
+        item.options.forEach((n) => {
+          if (n.value === row[item.columnName]) _val = n.label;
+        });
+      }
+      return _val || row[item.columnName];
+    },
+    async handelClickLook(type) {
+      this.showTable = true;
+      this.tableType = type;
+      this.pageNo = 1;
+      this.getTable()
+    },
+    async getTable(){
+      let url = "/actual/base/excelDataShow/quaryExcelDataList";
+      const {pageNo,pageSize,importCategory,tableType} = this;
+      let parm = {
+        taskId: this.taskId,
+        boolranFlag: tableType == "success" ? "1" : "0",
+        pageNo,
+        pageSize,
+        fileCategory:importCategory,
+      };
+      let { data, code, msg } = await requestPost(url, parm);
+      if (code == 0) {
+        this.showTable = true;
+        this.tableHeader = Object.entries(data.columnsDict).map((item) => ({
+          label: item[0],
+          columnName: item[1],
+        })); //属性名和属性值
+        this.tableData = data.excelDataShowDTOList.list;
+        this.total = data.excelDataShowDTOList.total;
+      } else if (code >= 8000) {
+        this.$message.error(msg);
+      }
+    },
+    pageCurrentChangeHandle (val) {
+      this.pageNo = val
+      this.getTable()
+    },
+    handelClickUpload() {
+      this.$emit("handelClickUpload");
+    },
+    handelClickBackList() {
+      this.$emit("handelClickBack");
+    },
+     handelClickDownFile(){
+      const url = "/actual/base/intelligentImportData/downloadFailExcel";
+      let parm = {
+        originFileName:this.originFileName,
+        resultDescFilePath :this.resultDescFilePath,
+      };
+      axios({
+        url: window.SITE_CONFIG["apiURL"] + url,
+        method: "post",
+        data:parm,
+        responseType: "blob",
+      })
+        .then((res) => {
+          let fileName = window.decodeURI(
+            res.headers["content-disposition"].split(";")[1].split("=")[1]
+          );
+          console.log("filename", fileName);
+          let blob = new Blob([res.data], { type: "application/vnd.ms-excel" });
+          var url = window.URL.createObjectURL(blob);
+          var aLink = document.createElement("a");
+          aLink.style.display = "none";
+          aLink.href = url;
+          aLink.setAttribute("download", fileName);
+          document.body.appendChild(aLink);
+          aLink.click();
+          document.body.removeChild(aLink); //下载完成移除元素
+          window.URL.revokeObjectURL(url); //释放掉blob对象
+        })
+        .catch((err) => {
+          console.log("获取导出情失败", err);
+          return this.$message.error("网络错误");
+        });
+    },
+    async getTaskInfo() {
+      let url = "/actual/base/intelligentImportData/getTaskInfo";
+      let parm = {
+        fileCode: this.fileCodeRow || this.fileCode,
+      };
+      let { data, code, msg } = await requestPost(url, parm);
+      if (code == 0) {
+        this.taskId = data.taskId;
+        this.importFailNum = data.importFailNum.toString();
+        this.importSuccessNum = data.importSuccessNum.toString();
+        this.importCategory = data.importCategory;
+        this.originFileName = data.originFileName;
+        this.resultDescFilePath = data.resultDescFile;
+        this.$emit("updateoperatorName", {
+          operatorName: data.operatorName,
+          createdTime: data.createdTime,
+        });
+      } else if (code >= 8000) {
+        this.$message.error(msg);
+      }
+    },
+  },
+  components: {},
+  computed: {},
+  watch: {},
+};
+</script>
+      <style lang="scss" scoped>
+@import "@/assets/scss/buttonstyle.scss";
+@import "@/assets/scss/modules/management/detail-main.scss";
+@import "@/assets/scss/pages/smartImport.scss";
+.left {
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+  align-items: center;
+  color: #838383;
+}
+</style>
+      
\ No newline at end of file
diff --git a/src/views/modules/base/smartImport/cpts/createdTask.vue b/src/views/modules/base/smartImport/cpts/createdTask.vue
new file mode 100644
index 000000000..80882d7c5
--- /dev/null
+++ b/src/views/modules/base/smartImport/cpts/createdTask.vue
@@ -0,0 +1,551 @@
+<template>
+  <div class="" v-loading="dataListLoading">
+    <h3 class="title-small">基本信息</h3>
+    <div class="content_box">
+      <div class="left">
+        <el-form
+          :model="form"
+          :rules="rules"
+          ref="importForm"
+          label-width="100px"
+        >
+          <el-form-item label="任务类型" prop="importCategory">
+            <el-select
+              v-model.trim="form.importCategory"
+              placeholder="请选择"
+              size="small"
+              class="u-item-width-normal"
+              clearable
+              @clear="handelClearCategory"
+            >
+              <el-option
+                v-for="item in resident_category_import_list"
+                :label="item.label"
+                :value="item.value"
+                :key="item.value"
+                @click.native="handelClickCategory(item.label)"
+              >
+              </el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="下载模板" prop="desc">
+            <span>
+              <span v-if="categoryName">{{
+                this.$store.state.user.agencyName + categoryName || ""
+              }}</span>
+              <span v-if="categoryName">导入模板.xlsx</span>
+              <span v-else>请先选择任务类型</span>
+              <el-button
+                type="text"
+                @click="handelClickDownModule"
+                v-if="categoryName"
+                >点击下载</el-button
+              ></span
+            >
+          </el-form-item>
+          <el-form-item label="任务名称" prop="taskName">
+            <el-input
+              v-model.trim="form.taskName"
+              size="small"
+              class="u-item-width-normal"
+              placeholder="请输入"
+            ></el-input>
+          </el-form-item>
+        </el-form>
+      </div>
+      <div class="right">
+        <h4>
+          <el-icon
+            class="el-icon-warning-outline"
+            style="color: #0056d6; font-size: 18px; font-weight: 600"
+          ></el-icon>
+          操作说明
+        </h4>
+        <p>
+          1、导入数据前请先确定您的网格组织已经维护完毕。<el-button
+            class="textBtn"
+            type="text"
+            @click="$router.push('/main/base-organization-organization')"
+            >查看</el-button
+          >
+        </p>
+        <p>2、导入房屋和居民信息前请先确保已经导入了完整的小区楼栋信息。</p>
+        <p>
+          3、您也可以<el-button
+            class="textBtn"
+            type="text"
+            @click="handleExportModuleAll"
+            >点击这里下载</el-button
+          >全部的导入模板文件
+        </p>
+      </div>
+    </div>
+    <h3 class="title-small">上传数据</h3>
+    <div class="content_box">
+      <div class="left">
+        <el-upload
+        v-if="fileList.length === 0"
+          :headers="$getElUploadHeaders()"
+          name="processFile"
+          action="uploadUlr"
+          :accept="'.xls,.xlsx'"
+          :limit="1"
+          drag
+          :before-upload="beforeExcelUpload"
+          :http-request="uploadHttpRequest"
+          class="text-center"
+          ref="upload"
+        >
+          <i class="el-icon-upload" style="font-size: 58px; color: #c5c9d1"></i>
+          <div class="el-upload__text" v-html="$t('upload.text')" ></div>
+        </el-upload>
+        <section  v-else class="uploadList">
+          <div v-for="file in fileList" :key="file.id" :file="file" style="display: flex; align-items: center">
+            <span>{{ file.name }}</span>
+            <el-button type="text"  @click="removeFile(file)" style="margin-left: 16px;"> 删除</el-button>
+          </div>
+        </section>
+      </div>
+      <div class="right">
+        <p>4、上传按导入模板整理后的excel数据文件。</p>
+        <p>5、文件大小不超过50M。</p>
+      </div>
+    </div>
+    <el-row type="flex" style="margin-top: 15px">
+      <el-col :span="12" align="center">
+        <el-button
+          style="margin-left: 10px"
+          size="small"
+          class="diy-button--white"
+          plain
+          @click="handelClickBack"
+          >取消</el-button
+        >
+        <el-button
+          class="diy-button--add"
+          size="small"
+          type="primary"
+          @click="handelClickUpload"
+        >
+          开始导入</el-button
+        >
+      </el-col>
+    </el-row>
+    <el-dialog
+      title="确认上传表格数据匹配关系"
+      :visible.sync="dialogVisibleExtractExcelHead"
+      width="75%"
+    >
+      <div v-if="dataList.length > 0" style="height: 600px; overflow-y: scroll">
+        <p style="margin-top: 0px;">
+          说明：您上传的表格列已自动匹配到系统对应的字段，请检查确认或手动调整，没有对应到系统字段的表格列将被忽略。
+
+        </p>
+        <el-table
+          ref="ref_table"
+          :data="dataList"
+          border
+          class="m-table-item"
+          style="width: 100%"
+        >
+          <el-table-column
+            label="序号"
+            header-align="center"
+            align="center"
+            type="index"
+            width="100"
+          ></el-table-column>
+          <el-table-column
+            prop="userTableHeader"
+            header-align="center"
+            align="center"
+            label="上传表格列"
+            min-width="80"
+          >
+            <template slot-scope="scope">
+              <span
+                :class="[
+                  scope.row.itemId && scope.row.itemId != ''
+                    ? ''
+                    : 'font_color_red',
+                ]"
+                >{{ scope.row.userTableHeader || "--" }}</span
+              >
+            </template>
+          </el-table-column>
+          <el-table-column
+            header-align="center"
+            align="center"
+            label="对应到"
+            min-width="50"
+          >
+            <template slot-scope="scope"><span v-if="scope.row.itemId"> =></span> </template>
+          </el-table-column>
+          <el-table-column
+            prop="itemGroupId"
+            header-align="center"
+            align="center"
+            label="系统字段"
+            min-width="110"
+          >
+            <template slot-scope="scope">
+              <div>
+                <el-select
+                  class="item_width_sel"
+                  v-model.trim="scope.row.itemGroupId"
+                  size="small"
+                  placeholder="请选择"
+                >
+                  <el-option
+                    v-for="item in groupList"
+                    @click.native="handleSelGroup(scope.$index, item, 'change')"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.label"
+                  >
+                  </el-option>
+                </el-select>
+
+                <el-select
+                  class="item_width_sel"
+                  v-model.trim="scope.row.itemId"
+                  size="small"
+                  style="margin-left: 10px"
+                  placeholder="请选择"
+                >
+                  <el-option
+                    v-for="item in scope.row.itemList"
+                    :key="item.itemId"
+                    :label="item.label"
+                    :value="item.label"
+                  >
+                  </el-option>
+                </el-select>
+              </div>
+            </template>
+          </el-table-column>
+        </el-table>
+      </div>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="dialogVisibleExtractExcelHead = false"
+          >取 消</el-button
+        >
+        <el-button type="primary" @click="dialogVisibleExtractExcelHead = false"
+          >确 定</el-button
+        >
+      </span>
+    </el-dialog>
+  </div>
+</template>
+  <script>
+import { requestPost } from "@/js/dai/request";
+
+export default {
+  data() {
+    return {
+      form: {
+        importCategory: null,
+        taskName: null,
+      },
+      rules: {
+        importCategory: [
+          { required: true, message: "请选择任务类型", trigger: "change" },
+        ],
+        taskName: [
+          { required: true, message: "请输入任务名称", trigger: "change" },
+        ],
+      },
+      resident_category_import_list: [],
+      categoryName: "",
+      createdFileName: null,
+      createdFileUrl: null,
+      dialogVisibleExtractExcelHead: false,
+      dataListLoading: false,
+      dataList: [],
+      groupList: [],
+      fileCode:null,
+      fileList:[]
+    };
+  },
+  props: {},
+  async created() {
+    await this.getDictList();
+    await this.loadPersonGroup();
+  },
+  methods: {
+    handelClearCategory() {
+      this.categoryName = null;
+    },
+    async loadPersonGroup() {
+      const url = "/oper/customize/icformitemgroup/list";
+      // const url = 'http://yapi.elinkservice.cn/mock/245/gov/org/isServiceProject/service/serviceScopeTree'
+      let params = {
+        formCode: "resident_base_info",
+        policyFlag: "1",
+      };
+
+      const { data, code, msg } = await requestPost(url, params);
+
+      if (code === 0) {
+        this.groupList = data;
+      } else {
+        this.$message.error(msg);
+      }
+    },
+    async handleSelGroup(index, item, change) {
+      const url = "/oper/customize/icformitem/getItemListV2";
+      // const url = 'http://yapi.elinkservice.cn/mock/245/gov/org/isServiceProject/service/serviceScopeTree'
+      let params = {
+        // policyFlag: "1",
+        groupId: item.id,
+      };
+      const { data, code, msg } = await requestPost(url, params);
+
+      if (code === 0) {
+        let oneData = this.dataList[index];
+        if (change == "change") {
+          this.dataList[index].itemId = "";
+        }
+        oneData.itemList = data;
+        this.$set(this.dataList, index, oneData);
+        console.log(this.dataList);
+      } else {
+        this.$message.error(msg);
+      }
+    },
+
+    handelClickCategory(label) {
+      this.categoryName = label;
+    },
+
+    async checkExtractExcelHead() {
+      const url = "/actual/base/intelligentImportData/extractExcelHead";
+      let params = {
+        originFileName: this.createdFileName,
+        originalFilePath: this.createdFileUrl,
+        importCategory: this.form.importCategory,
+      };
+      const { data, code, msg } = await requestPost(url, params);
+      if (code === 0) {
+        this.dialogVisibleExtractExcelHead = true;
+        const { metaListData, fileCode, msg } = data;
+        this.dataList = metaListData;
+        this.fileCode = fileCode;
+        let groupMap = new Map(
+          this.groupList.map((item) => [item.label, item])
+        );
+        for (let i in this.dataList) {
+          this.handleSelGroup(i, groupMap.get(this.dataList[i].itemGroupId));
+        }
+        this.dataListLoading = false;
+      } else if (code >= 8000) {
+        this.$message.err(msg);
+        this.dataListLoading = false;
+      }
+    },
+    async getDictList() {
+      const url = "/sys/dict/data/dictlist";
+      const { data, code, msg } = await requestPost(url, {
+        dictType: "resident_category_import",
+      });
+      if (code === 0) {
+        this.resident_category_import_list = [...data];
+      } else {
+        this.$message.err("字典错误");
+      }
+    },
+
+    beforeExcelUpload(file) {
+      this.dataListLoading = true;
+      const isType = file.type === "application/vnd.ms-excel";
+      const isTypeComputer =
+        file.type ===
+        "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet";
+      const fileType = isType || isTypeComputer;
+      const isLt1M = file.size / 1024 / 1024 < 50;
+      if (!fileType) {
+        this.$message.error("上传文件只能是xls/xlsx格式！");
+      }
+
+      if (!isLt1M) {
+        this.$message.error("上传文件大小不能超过 10MB!");
+      }
+
+      if (!this.form.importCategory || !this.form.taskName) {
+        this.$message.error("请完善基本信息!");
+        this.dataListLoading = false;
+        return false;
+      }
+      return fileType && isLt1M;
+    },
+    async uploadHttpRequest(file) {
+      const formData = new FormData();
+      formData.append("file", file.file);
+      await this.$http
+        .post("/actual/base/intelligentImportData/uploadFile", formData)
+        .then((res) => {
+          if (res.data.code == 0) {
+            const { fileName, url } = res.data.data;
+            this.createdFileName = fileName;
+            this.createdFileUrl = url;
+            this.fileList.push({name:fileName,url:url})
+            this.checkExtractExcelHead();
+          } else {
+            this.$message.error(res.data.msg);
+            this.dataListLoading = false;
+          }
+        })
+        .catch((err) => {
+          console.log("失败", err);
+          file.onError(); //上传失败的文件会从文件列表中删除
+          this.dataListLoading = false;
+        });
+      this.$refs.upload.clearFiles();
+    },
+    removeFile(){
+      this.fileList = [];
+    },
+    // 下载全部模板
+    async handleExportModuleAll() {
+      let url = "/actual/base/residentBaseInfo/import/download-template";
+
+      let params = {};
+      await this.$http({
+        method: "POST",
+        url,
+        responseType: "blob",
+        data: params,
+      })
+        .then((res) => {
+          console.log(res);
+          const url = window.URL.createObjectURL(new Blob([res.data]));
+          const aLink = document.createElement("a");
+          aLink.style.display = "none";
+          aLink.href = url;
+          aLink.setAttribute("download", "全部模板.zip");
+          document.body.appendChild(aLink);
+          aLink.click();
+          document.body.removeChild(aLink);
+          window.URL.revokeObjectURL(url);
+        })
+        .catch((err) => {
+          console.log("err", err);
+          return this.$message.error("网络错误");
+        });
+    },
+    // 下载单个模板
+    async handelClickDownModule() {
+      let url = "/actual/base/intelligentImportData/autoGenerateExcelModule";
+      let params = {
+        importCategory: this.form.importCategory,
+      };
+      await this.$http({
+        method: "POST",
+        url,
+        responseType: "blob",
+        data: params,
+      })
+        .then((res) => {
+          if (res.status==200) {
+            // let fileName = window.decodeURI(
+            // 	res.headers["content-disposition"]
+            // 		.split(";")[1]
+            // 		.split("=")[1]
+            // );
+            let fileName = `${
+              this.$store.state.user.agencyName + this.categoryName
+            }导入模板`;
+            let blob = new Blob([res.data], {
+              type: "application/vnd.ms-excel",
+            });
+            var url = window.URL.createObjectURL(blob);
+            var aLink = document.createElement("a");
+            aLink.style.display = "none";
+            aLink.href = url;
+            aLink.setAttribute("download", fileName);
+            document.body.appendChild(aLink);
+            aLink.click();
+            document.body.removeChild(aLink); //下载完成移除元素
+            window.URL.revokeObjectURL(url); //释放掉blob对象
+          } else this.$message.error("下载失败");
+          // let fileName = `${
+          //     this.$store.state.user.agencyName + this.categoryName
+          //   }导入模板`;
+          // const url = res.data.data;
+          // const aLink = document.createElement("a");
+          // aLink.style.display = "none";
+          // aLink.href = url;
+          // aLink.setAttribute("download",`${fileName}.xlsx`);
+          // document.body.appendChild(aLink);
+          // aLink.click();
+          // document.body.removeChild(aLink);
+          // window.URL.revokeObjectURL(url);
+        })
+        .catch((err) => {
+          console.log(err);
+          return this.$message.error("网络错误");
+        });
+    },
+    handelClickUpload() {
+      this.$refs["importForm"].validate((valid) => {
+        if (valid) {
+          this.saveImportResiHouseExcel();
+        }
+      });
+    },
+    async saveImportResiHouseExcel() {
+      const { fileCode, dataList } = this;
+      if (!fileCode) {
+        this.$message.error("请先上传文件");
+        return;
+      }
+      let obj = dataList.reduce((acc, item) => {
+        if (item.userTableHeader) {
+          acc[item.userTableHeader] = item.itemId;
+        }
+        return acc;
+      }, {});
+      const formData = new FormData();
+      formData.append("columnMateJson", JSON.stringify(obj));
+      formData.append("fileCode", fileCode);
+      formData.append("taskName", this.form.taskName);
+      await this.$http
+        .post(
+          "/actual/base/intelligentImportData/importResiHouseExcel",
+          formData
+        )
+        .then((res) => {
+          console.log("res-up", res);
+          if (res.data.code == 0 && res.data.msg == "success") {
+            this.$emit("handelClickUpload", fileCode);
+          } else this.$message.error(res.data.msg);
+        })
+        .catch((err) => {
+          console.log("失败", err);
+          file.onError();
+        });
+    },
+    handelClickBack() {
+      this.$emit("handelClickBack");
+    },
+  },
+  components: {},
+  computed: {},
+  watch: {},
+};
+</script>
+  <style lang="scss" scoped>
+@import "@/assets/scss/buttonstyle.scss";
+@import "@/assets/scss/modules/management/detail-main.scss";
+@import "@/assets/scss/pages/smartImport.scss";
+.uploadList{
+  width: 99%;
+  height: 180px;
+  border: 1px dashed  #ccc;
+  border-radius: 5px;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+}
+</style>
+  
\ No newline at end of file
diff --git a/src/views/modules/base/smartImport/cpts/executeTask.vue b/src/views/modules/base/smartImport/cpts/executeTask.vue
new file mode 100644
index 000000000..52551d636
--- /dev/null
+++ b/src/views/modules/base/smartImport/cpts/executeTask.vue
@@ -0,0 +1,281 @@
+<template>
+  <div class="">
+    <div class="content_box">
+      <div class="left">
+        <img class="rotate" src="@/assets/images/index/loading.png" alt="" />
+        <p>请您耐心等待！如果您发现导入数据问题较多，可以取消导入</p>
+        <div>
+          <el-button
+            style="margin-left: 10px"
+            size="small"
+            type="primary"
+            @click="handelClickBackList"
+            >返回任务列表</el-button
+          >
+          <el-button
+            style="margin-left: 10px"
+            size="small"
+            class="diy-button--white"
+            plain
+            @click="handelClickBack"
+            >取消导入</el-button
+          >
+        </div>
+      </div>
+      <div class="right">
+        <h4>
+          <el-icon
+            class="el-icon-warning-outline"
+            style="color: #0056d6; font-size: 18px; font-weight: 600"
+          ></el-icon>
+          操作说明
+        </h4>
+        <p>1、导入数据多大，系统需要一定事件处理。</p>
+        <p>
+          2、导入过程中可查看导入明细，如果发现导入数据问题较多，可以取消本次导入，重新整理数据后，重新创建任务导入。
+        </p>
+        <p>3、导入失败的数据，您可以下载失败文件，修改后重新创建任务导入</p>
+      </div>
+    </div>
+    <h3 class="title-small">数据导入明细</h3>
+    <el-row type="flex" justify="">
+      <el-col :span="24">
+        <i class="el-icon-circle-check" style="color: #1cc58c; font-size: 15px;font-weight: 600;"></i>  {{ this.importSuccessNum || "--" }}条数据已导入。<el-button
+          type="text"
+          @click="handelClickLook('success')"
+          >查看</el-button
+        >
+      </el-col>
+    </el-row>
+    <el-row type="flex" justify="">
+      <el-col :span="24">
+        <i class="el-icon-circle-close" style="color: #ff5b5d;font-size: 15px;font-weight: 600;"></i> {{ this.importFailNum || "--" }}条问题数据导入失败。<el-button
+          type="text"
+          @click="handelClickLook('fail')"
+          >查看</el-button
+        >
+      </el-col>
+    </el-row>
+    <el-dialog
+      title="导入结果明细"
+      :visible.sync="showTable"
+      width="50%"
+      v-if="showTable"
+    >
+      <el-table
+        :data="tableData"
+        row-key="fileCode"
+        border
+        style="width: 100%"
+      >
+        <el-table-column
+          v-for="item in tableHeader"
+          :key="item.columnName"
+          :prop="item.columnName"
+          :label="item.label"
+          :align="item.align"
+          show-overflow-tooltip
+        >
+          <template slot-scope="scope">
+            <span>{{ handleFilterSpan(scope.row, item) }}</span>
+          </template>
+        </el-table-column>
+      </el-table>
+      <el-pagination
+        :current-page="pageNo"
+        :page-size="pageSize"
+        :total="total"
+        layout=" prev, pager, next"
+        @current-change="pageCurrentChangeHandle"
+        >
+      </el-pagination>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="showTable = false">取 消</el-button>
+        <el-button type="primary" @click="showTable = false"
+          >确 定</el-button
+        >
+      </span>
+    </el-dialog>
+  </div>
+</template>
+    <script>
+import { requestPost, requestGet } from "@/js/dai/request";
+
+export default {
+  data() {
+    return {
+      rules: {
+        importCategory: [
+          { required: true, message: "请选择任务类型", trigger: "change" },
+        ],
+        taskName: [
+          { required: true, message: "请输入任务名称", trigger: "change" },
+        ],
+      },
+      resident_category_import_list: [],
+      taskId: null,
+      timerId: null,
+      importSuccessNum: null,
+      importFailNum: null,
+      importCategory: null,
+      showTable: false,
+      tableHeader: [],
+      tableData:[],
+      pageNo:1,
+      pageSize:20,
+      total:0,
+      tableType:null,
+    };
+  },
+  props: {
+    fileCodeRow: {
+      type: String,
+      default: "",
+    },
+    fileCode:{
+      type:String,
+      default:""
+    }
+  },
+  async created() {
+    await this.getTaskInfo();
+    await this.startTimer();
+  },
+  methods: {
+    handleFilterSpan(row, item) {
+      let _val = "";
+      if (item.options && item.options.length > 0) {
+        item.options.forEach((n) => {
+          if (n.value === row[item.columnName]) _val = n.label;
+        });
+      }
+      return _val || row[item.columnName];
+    },
+    startTimer() {
+      if (!this.timerId) {
+        this.timerId = setInterval(this.getProcessRate, 500);
+      }
+    },
+    // 停止定时器
+    stopTimer() {
+      clearInterval(this.timerId);
+      this.timerId = null;
+    },
+    async getProcessRate() {
+      let url = "/actual/base/intelligentImportData/processRate";
+      let parm = {
+        fileCode: this.fileCodeRow|| this.fileCode,
+      };
+      let res = await requestPost(url, parm);
+      if (res.code == 0) {
+        if (res.data === 100) {
+          this.stopTimer();
+          this.$emit('successImport')
+        }else{
+          this.$emit('updateProgress',res.data)
+        }
+      } else if (code >= 8000) {
+        this.$message.error(msg);
+      }
+    },
+    async getTaskInfo() {
+      let url = "/actual/base/intelligentImportData/getTaskInfo";
+      let parm = {
+        fileCode: this.fileCodeRow || this.fileCode,
+      };
+      let { data, code, msg } = await requestPost(url, parm);
+      if (code == 0) {
+        this.taskId = data.taskId;
+        this.importFailNum = data.importFailNum.toString();
+        this.importSuccessNum = data.importSuccessNum.toString();
+        this.importCategory = data.importCategory;
+        this.$emit('updateoperatorName',{operatorName:data.operatorName,createdTime:data.createdTime})
+        if (data.processStatus != "processing") {
+          this.stopTimer();
+        }
+      } else if (code >= 8000) {
+        this.$message.error(msg);
+      }
+    },
+    async handelClickLook(type) {
+      this.showTable = true;
+      this.tableType = type;
+      this.pageNo = 1;
+      this.getTable()
+    },
+    async getTable(){
+      let url = "/actual/base/excelDataShow/quaryExcelDataList";
+      const {pageNo,pageSize,importCategory,tableType} = this;
+      let parm = {
+        taskId: this.taskId,
+        boolranFlag: tableType == "success" ? "1" : "0",
+        pageNo,
+        pageSize,
+        fileCategory:importCategory,
+      };
+      let { data, code, msg } = await requestPost(url, parm);
+      if (code == 0) {
+        this.showTable = true;
+        this.tableHeader = Object.entries(data.columnsDict).map((item) => ({
+          label: item[0],
+          columnName: item[1],
+        })); //属性名和属性值
+        this.tableData = data.excelDataShowDTOList.list;
+        this.total = data.excelDataShowDTOList.total;
+      } else if (code >= 8000) {
+        this.$message.error(msg);
+      }
+    },
+
+    async cancelTask() {
+      let url = "/actual/base/intelligentImportData/cancelTask";
+      let parm = {
+        fileCode: this.fileCode,
+        taskId: this.taskId,
+      };
+      let { data, code, msg } = await requestPost(url, parm);
+      if (code == 0) {
+        console.log(data);
+        this.$message.info("任务已取消");
+        this.$emit("handelClickBack");
+      } else if (code >= 8000) {
+        this.$message.error(msg);
+      }
+    },
+    handelClickBack() {
+      this.$confirm(`您确定要取消本次数据导入任务吗`, {
+        confirmButtonText: "确定",
+        cancelButtonText: "再想想",
+        type: "warning",
+      })
+        .then(() => {
+          this.cancelTask();
+        })
+        .catch(() => {});
+    },
+
+    handelClickBackList() {
+      this.$emit("handelClickBack");
+    },
+  },
+  destroyed() {
+    this.stopTimer();
+  },
+  components: {},
+  computed: {},
+  watch: {},
+};
+</script>
+    <style lang="scss" scoped>
+@import "@/assets/scss/buttonstyle.scss";
+@import "@/assets/scss/modules/management/detail-main.scss";
+@import "@/assets/scss/pages/smartImport.scss";
+.left {
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+  align-items: center;
+  color: #838383;
+}
+</style>
+    
\ No newline at end of file
diff --git a/src/views/modules/base/smartImport/cpts/smartImportInfo.vue b/src/views/modules/base/smartImport/cpts/smartImportInfo.vue
new file mode 100644
index 000000000..ef596f07f
--- /dev/null
+++ b/src/views/modules/base/smartImport/cpts/smartImportInfo.vue
@@ -0,0 +1,116 @@
+<template>
+  <div class="m-detail-main">
+    <el-card>
+      <div class="steps">
+        <el-steps :active="progress">
+          <el-step
+            :class="[this.operatorName == null ? 'showNum' : '']"
+            title="创建任务"
+            :description="`${this.operatorName}(${this.createdTime})`"
+          ></el-step>
+          <el-step
+            title="正在导入"
+            :class="[this.progress == 2 || this.progress == 3 ? '' : 'showNum']"
+            :description="`导入进度${
+              this.progressNum ? this.progressNum : 100
+            }%`"
+          ></el-step>
+          <el-step title="导入完成"></el-step>
+        </el-steps>
+      </div>
+      <div style="margin-top: 37px">
+        <created-task
+          v-if="progress == 1"
+          @handelClickUpload="handelClickUpload"
+          @handelClickBack="handelClickBack"
+        ></created-task>
+        <execute-task
+          v-if="progress == 2"
+          @successImport="successImport"
+          @handelClickBack="handelClickBack"
+          @updateProgress="updateProgress"
+          :fileCode="fileCode"
+          :fileCodeRow="fileCodeRow"
+          @updateoperatorName="updateoperatorName"
+        ></execute-task>
+        <complete-task
+          v-if="progress == 3"
+          @handelClickBack="handelClickBack"
+          :fileCodeRow="fileCodeRow"
+          @updateoperatorName="updateoperatorName"
+          :fileCode="fileCode"
+        ></complete-task>
+      </div>
+    </el-card>
+  </div>
+</template>
+  <script>
+import createdTask from "./createdTask.vue";
+import executeTask from "./executeTask.vue";
+import completeTask from "./completeTask.vue";
+export default {
+  data() {
+    return {
+      progress: 1,
+      fileCode: null,
+      progressNum: null,
+      createdTime: null,
+      operatorName: null,
+    };
+  },
+  props: {
+    fileCodeRow: {
+      type: String,
+      default: null,
+    },
+    taskId: {
+      type: String,
+      default: null,
+    },
+    processStatus: {
+      type: String,
+      default: null,
+    },
+  },
+  created() {
+    console.log(this.processStatus);
+    if (this.processStatus) {
+      this.progress = this.processStatus == "processing" ? 2 : 3;
+    }
+  },
+  methods: {
+    handelClickUpload(fileCode) {
+      this.progress = 2;
+      this.fileCode = fileCode;
+    },
+    handelClickBack() {
+      this.$emit("handleClose");
+    },
+    successImport() {
+      this.progress = 3;
+      this.progressNum = 100;
+    },
+    updateProgress(num) {
+      this.progressNum = num;
+    },
+    updateoperatorName({ operatorName, createdTime }) {
+      this.operatorName = operatorName;
+      this.createdTime = createdTime;
+    },
+  },
+  components: { createdTask, executeTask, completeTask },
+  computed: {},
+  watch: {},
+};
+</script>
+  <style lang="scss" scoped>
+@import "@/assets/scss/buttonstyle.scss";
+@import "@/assets/scss/modules/management/detail-main.scss";
+@import "@/assets/scss/pages/smartImport.scss";
+.showNum {
+  /deep/.el-step__description {
+    display: none;
+  }
+}
+</style>
+  
\ No newline at end of file
diff --git a/src/views/modules/base/smartImport/index.vue b/src/views/modules/base/smartImport/index.vue
new file mode 100644
index 000000000..fb69c30a5
--- /dev/null
+++ b/src/views/modules/base/smartImport/index.vue
@@ -0,0 +1,276 @@
+<template>
+  <div class="g-main">
+    <div  v-show="pageType == 'list'">
+      <div class="m-search">
+        <el-form  :inline="true" :model="formData"  :label-width="'100px'">
+        <el-form-item label="任务类型">
+            <el-select v-model.trim="formData.importCategory" placeholder="请输入" size="small" class="u-item-width-normal" clearable>
+              <el-option v-for="item in dicts.resident_category_import" :key="item.value" :label="item.label" :value="item.value">
+              </el-option>
+            </el-select>
+          </el-form-item>
+
+          <el-form-item label="状态">
+            <el-select v-model.trim="formData.processStatus" placeholder="请输入" size="small" class="u-item-width-normal" clearable>
+              <el-option v-for="item in dicts.import_status" :key="item.value" :label="item.label" :value="item.value">
+              </el-option>
+            </el-select>
+          </el-form-item>
+
+          <el-form-item label="任务名称">
+            <el-input v-model.trim="formData.taskName" placeholder="请输入" size="small" class="u-item-width-normal"
+              clearable></el-input>
+          </el-form-item>
+          <el-row type="flex">
+            <el-col :span="24" align="right">
+              <el-button style="margin-left: 30px" size="small" type="primary " @click="handleSearch">查询</el-button>
+              <el-button style="margin-left: 10px" is-plain class="diy-button--white el-button--default" size="small"
+                @click="resetSearch">重置</el-button>
+            </el-col>
+          </el-row>
+        </el-form>
+      </div>
+
+      <div class="m-table">
+        <div class="div_btn">
+          <el-button size="small" @click="handleAdd" type="primary" icon="el-icon-plus">新建导入任务</el-button>
+        </div>
+
+        <el-table :data="tableData" border v-loading="tableLoading" class="m-table-item" style="width: 100%"
+          :height="maxTableHeight">
+          <el-table-column type="selection" fixed="left" align="center" width="50" />
+          <el-table-column label="序号" fixed="left" type="index" align="center" width="50" />
+
+          <el-table-column prop="taskName" align="center"  label="任务名称" :show-overflow-tooltip="true">
+          </el-table-column>
+          <el-table-column prop="importCategoryName" align="center" width="150" label="任务类型" :show-overflow-tooltip="true">
+           
+          </el-table-column>
+
+          <el-table-column prop="processStatus" align="center" width="200" label="状态" :show-overflow-tooltip="true">
+            <template slot-scope="scope">
+              <span>{{ binaryText(scope.row.processStatus) }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column prop="importSuccessNum" align="center" width="80" label="成功数目" :show-overflow-tooltip="true">
+          </el-table-column>
+          <el-table-column prop="importFailNum" align="center" width="80" label="失败数目" :show-overflow-tooltip="true">
+          </el-table-column>
+          <el-table-column prop="operatorName" align="center" width="100" label="操作人" :show-overflow-tooltip="true"> 
+          </el-table-column>
+          <el-table-column prop="completedTime" align="center" width="180" label="操作完成时间"
+            :show-overflow-tooltip="true">
+          </el-table-column>
+          <el-table-column fixed="right" label="操作" align="center" width="220">
+            <template slot-scope="scope">
+              <el-button @click="handleCloseImport(scope.row)" v-if="scope.row.importCategory === 'processing'" type="text" size="small">取消导入</el-button>
+              <!-- <el-button @click="handleCloseCheck(scope.row)"  v-if="scope.row.importCategory === 'processing'" type="text" size="small">确认完成</el-button> -->
+              <el-button @click="handleDetail(scope.row)" type="text" size="small">查看</el-button>
+            </template>
+          </el-table-column>
+        </el-table>
+        <div>
+          <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page.sync="pageNo"
+            :page-sizes="[20, 50, 100, 200]" :page-size="parseInt(pageSize)" layout="sizes, prev, pager, next, total"
+            :total="total">
+          </el-pagination>
+        </div>
+      </div>
+    </div>
+    <div v-if="pageType == 'add'">
+      <!-- :eventDetailData="eventDetailData" -->
+            <smart-import-info ref="eleEditForm" :pageType="pageType"  
+                @handleClose="handleClose" @handleOk="handleOk" :fileCodeRow="fileCode" :taskId="taskId" :processStatus="processStatus"/>
+        </div>
+  </div>
+</template>
+  
+<script>
+import { requestPost } from "@/js/dai/request";
+import { genderList, binaryOptionList } from "@/js/columns/constants";
+import nextTick from "dai-js/tools/nextTick";
+import { mapGetters } from "vuex";
+import axios from "axios";
+import smartImportInfo from "./cpts/smartImportInfo";
+export default {
+  components: {smartImportInfo},
+
+  data() {
+    return {
+      tableLoading: false,
+      searchH: 170,
+      tableData: [],
+      genderList,
+      binaryOptionList,
+      formData: {},
+      pageNo: 1,
+      pageSize: window.localStorage.getItem("pageSize") || 20,
+      total: 1,
+      pageType: "list", // 列表list 新增add  详情detail
+
+      dicts: {
+        import_status:[],
+        resident_category_import:[],
+      }, //字典对象
+
+      fileCode:null,
+      taskId:null,
+      processStatus:null,
+    };
+  },
+  computed: {
+    maxTableHeight() {
+      const h = this.clientHeight - this.searchH - 330 + this.iframeHeight;
+      const _h = this.clientHeight - 330 - this.searchH;
+      return this.$store.state.inIframe ? h : _h;
+    },
+    ...mapGetters(["clientHeight", "iframeHeight"]),
+  },
+  watch: {},
+  async created() {
+    await this.getDicts();
+  },
+  mounted() {
+    this.getTableData();
+  },
+  methods: {
+    // --------------------------------------字典------------------------------------------
+    async getDicts() {
+      try {
+        const dictTypes = ["import_status", 'resident_category_import']; // 把所有dictType放在这个数组里
+        const requests = dictTypes.map((dictType) => {
+          return this.$http.post("sys/dict/data/dictlist", {
+            dictType: dictType,
+          });
+        });
+        const results = await Promise.all(requests);
+        results.forEach((result, index) => {
+          if (result.data.code === 0) {
+            this.dicts[dictTypes[index]].push(...result.data.data);
+          } else {
+            console.log(`获取${dictTypes[index]}字典失败: ${result.msg}`);
+          }
+        });
+      } catch (error) {
+        console.log("获取字典失败: ", error);
+      }
+    },
+    binaryText(value) {
+      let text = "";
+      let foundItem = this.dicts.import_status.filter(
+        (item) => item.value == value
+      )[0];
+      text = foundItem ? foundItem.label : "--";
+      return text;
+    },
+    // ------------------------------------事件------------------------------------------
+    // 搜索事件
+    handleSearch(val) {
+      console.log(this.formData);
+      this.pageNo = 1;
+      this.getTableData();
+    },
+
+    //   调出新增组件
+    async handleAdd() {
+      this.pageType = "add";
+      this.fileCode = null;
+    },
+    //   查看详情触发事件
+    async handleDetail(row) {
+      this.pageType = "add";
+      const {taskId,fileCode,processStatus} = row;
+      this.taskId = taskId;
+      this.fileCode = fileCode;
+      this.processStatus = processStatus;
+    },
+   
+    //  新增弹出框组件取消事件
+    handleClose() {
+      this.pageType = "list";
+      this.processStatus = null;
+      this.pageNo = 1;
+      this.getTableData();
+    },
+    //  新增弹出框组件确定事件
+    handleOk(type) {
+     
+    },
+    //   删除触发事件
+    async handleDel(row) {
+      this.$confirm("确认删除?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+          this.cancelFuwu([row.categorizedResiId]);
+        })
+        .catch((err) => {
+          if (err == "cancel") {
+            // this.$message({
+            //   type: "info",
+            //   message: "已取消删除"
+            // });
+          }
+        });
+    },
+    //   删除处理
+    async cancelFuwu(id) {
+      const url = "/actual/base/resiCategorized/disability/deleteBatch";
+      const { data, code, msg } = await requestPost(url, id);
+      if (code === 0) {
+        this.$message.success("删除成功！");
+        this.getTableData();
+      } else {
+        this.$message.error("操作失败！");
+      }
+    },
+    //   获取列表
+    async getTableData() {
+      this.tableLoading = true;
+      const url = "/commonservice/import-task/pageList";
+      const { pageSize, pageNo, formData } = this;
+      const { data, code, msg } = await requestPost(url, {
+        pageSize,
+        pageNo,
+        ...formData,
+      });
+      this.tableLoading = false;
+      if (code === 0) {
+        this.total = data.total || 0;
+        this.tableData = data.list;
+      } else {
+        this.$message.error(msg);
+      }
+    },
+
+    //   分页
+    handleSizeChange(val) {
+      this.pageSize = val;
+      window.localStorage.setItem("pageSize", val);
+      this.getTableData();
+    },
+
+    //   分页
+    handleCurrentChange(val) {
+      this.pageNo = val;
+      this.getTableData();
+    },
+    //   重置
+    resetSearch() {
+      this.formData = {};
+
+      this.pageNo = 1;
+      this.getTableData();
+    },
+  },
+
+  props: {},
+};
+</script>
+<style lang="scss" scoped>
+@import "@/assets/scss/buttonstyle.scss";
+@import "@/assets/scss/modules/management/list-main.scss";
+</style>
+  
\ No newline at end of file
diff --git a/src/views/modules/base/visitor.vue b/src/views/modules/base/visitor.vue
index 599d80ee4..c07b1c319 100644
--- a/src/views/modules/base/visitor.vue
+++ b/src/views/modules/base/visitor.vue
@@ -9,7 +9,7 @@
       >
         <el-form-item label="填写时间" prop="startTime">
           <el-date-picker
-            v-model="timeRange"
+            v-model.trim="timeRange"
             type="datetimerange"
             clearable
             size="small"
diff --git a/src/views/modules/cabaseinfo/caloudong-add-or-update.vue b/src/views/modules/cabaseinfo/caloudong-add-or-update.vue
index f1e3076b7..33e36b123 100644
--- a/src/views/modules/cabaseinfo/caloudong-add-or-update.vue
+++ b/src/views/modules/cabaseinfo/caloudong-add-or-update.vue
@@ -2,76 +2,76 @@
   <el-dialog :visible.sync="visible" :title="!dataForm.id ? $t('add') : $t('查看')" :close-on-click-modal="false" :close-on-press-escape="false">
     <el-form :disabled="true" :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" :label-width="$i18n.locale === 'en-US' ? '120px' : '80px'">
       <el-form-item label="楼宇类型" prop="buildingType">
-          <el-input v-model="dataForm.buildingType" placeholder="楼宇类型"></el-input>
+          <el-input v-model.trim="dataForm.buildingType" placeholder="楼宇类型"></el-input>
       </el-form-item>
       <el-form-item label="楼宇名称" prop="buildingName">
-          <el-input v-model="dataForm.buildingName" placeholder="楼宇名称"></el-input>
+          <el-input v-model.trim="dataForm.buildingName" placeholder="楼宇名称"></el-input>
       </el-form-item>
       <el-form-item label="用途分类" prop="buildingUse">
-          <el-input v-model="dataForm.buildingUse" placeholder="用途分类"></el-input>
+          <el-input v-model.trim="dataForm.buildingUse" placeholder="用途分类"></el-input>
       </el-form-item>
       <el-form-item label="楼宇状态" prop="buildingStatus">
-          <el-input v-model="dataForm.buildingStatus" placeholder="楼宇状态"></el-input>
+          <el-input v-model.trim="dataForm.buildingStatus" placeholder="楼宇状态"></el-input>
       </el-form-item>
       <el-form-item label="楼宇结构" prop="buildingStructure">
-          <el-input v-model="dataForm.buildingStructure" placeholder="楼宇结构"></el-input>
+          <el-input v-model.trim="dataForm.buildingStructure" placeholder="楼宇结构"></el-input>
       </el-form-item>
       <el-form-item label="使用现状" prop="buildingUseage">
-          <el-input v-model="dataForm.buildingUseage" placeholder="使用现状"></el-input>
+          <el-input v-model.trim="dataForm.buildingUseage" placeholder="使用现状"></el-input>
       </el-form-item>
       <el-form-item label="建筑时间" prop="constructionTime">
-          <el-input v-model="dataForm.constructionTime" placeholder="建筑时间"></el-input>
+          <el-input v-model.trim="dataForm.constructionTime" placeholder="建筑时间"></el-input>
       </el-form-item>
       <el-form-item label="所处位置" prop="buildingAddr">
-          <el-input v-model="dataForm.buildingAddr" placeholder="所处位置"></el-input>
+          <el-input v-model.trim="dataForm.buildingAddr" placeholder="所处位置"></el-input>
       </el-form-item>
       <el-form-item label="小区（单位）名称" prop="communityName">
-          <el-input v-model="dataForm.communityName" placeholder="小区（单位）名称"></el-input>
+          <el-input v-model.trim="dataForm.communityName" placeholder="小区（单位）名称"></el-input>
       </el-form-item>
       <el-form-item label="楼栋长" prop="buildingLeader">
-          <el-input v-model="dataForm.buildingLeader" placeholder="楼栋长"></el-input>
+          <el-input v-model.trim="dataForm.buildingLeader" placeholder="楼栋长"></el-input>
       </el-form-item>
       <el-form-item label="楼层数" prop="layerCount">
-          <el-input v-model="dataForm.layerCount" placeholder="楼层数"></el-input>
+          <el-input v-model.trim="dataForm.layerCount" placeholder="楼层数"></el-input>
       </el-form-item>
       <el-form-item label="地下楼层数" prop="basementLayerCount">
-          <el-input v-model="dataForm.basementLayerCount" placeholder="地下楼层数"></el-input>
+          <el-input v-model.trim="dataForm.basementLayerCount" placeholder="地下楼层数"></el-input>
       </el-form-item>
       <el-form-item label="住宅开始层数" prop="houseBeginLayer">
-          <el-input v-model="dataForm.houseBeginLayer" placeholder="住宅开始层数"></el-input>
+          <el-input v-model.trim="dataForm.houseBeginLayer" placeholder="住宅开始层数"></el-input>
       </el-form-item>
       <el-form-item label="单元数" prop="unitCount">
-          <el-input v-model="dataForm.unitCount" placeholder="单元数"></el-input>
+          <el-input v-model.trim="dataForm.unitCount" placeholder="单元数"></el-input>
       </el-form-item>
       <el-form-item label="每层每单元户数" prop="layerRoomCount">
-          <el-input v-model="dataForm.layerRoomCount" placeholder="每层每单元户数"></el-input>
+          <el-input v-model.trim="dataForm.layerRoomCount" placeholder="每层每单元户数"></el-input>
       </el-form-item>
       <el-form-item label="总房屋数" prop="roomCount">
-          <el-input v-model="dataForm.roomCount" placeholder="总房屋数"></el-input>
+          <el-input v-model.trim="dataForm.roomCount" placeholder="总房屋数"></el-input>
       </el-form-item>
       <el-form-item label="电梯数量" prop="elevatorCount">
-          <el-input v-model="dataForm.elevatorCount" placeholder="电梯数量"></el-input>
+          <el-input v-model.trim="dataForm.elevatorCount" placeholder="电梯数量"></el-input>
       </el-form-item>
       <el-form-item label="建筑面积" prop="buildingArea">
-          <el-input v-model="dataForm.buildingArea" placeholder="建筑面积"></el-input>
+          <el-input v-model.trim="dataForm.buildingArea" placeholder="建筑面积"></el-input>
       </el-form-item>
       <el-form-item label="物业公司" prop="buildingPmc">
-          <el-input v-model="dataForm.buildingPmc" placeholder="物业公司"></el-input>
+          <el-input v-model.trim="dataForm.buildingPmc" placeholder="物业公司"></el-input>
       </el-form-item>
       <el-form-item label="介绍" prop="buildingDesc">
-          <el-input v-model="dataForm.buildingDesc" placeholder="介绍"></el-input>
+          <el-input v-model.trim="dataForm.buildingDesc" placeholder="介绍"></el-input>
       </el-form-item>
       <el-form-item label="标绘状态" prop="pointStatus">
-          <el-input v-model="dataForm.pointStatus" placeholder="标绘状态"></el-input>
+          <el-input v-model.trim="dataForm.pointStatus" placeholder="标绘状态"></el-input>
       </el-form-item>
       <el-form-item label="经度" prop="longitude">
-          <el-input v-model="dataForm.longitude" placeholder="经度"></el-input>
+          <el-input v-model.trim="dataForm.longitude" placeholder="经度"></el-input>
       </el-form-item>
       <el-form-item label="纬度" prop="latitude">
-          <el-input v-model="dataForm.latitude" placeholder="纬度"></el-input>
+          <el-input v-model.trim="dataForm.latitude" placeholder="纬度"></el-input>
       </el-form-item>
       <el-form-item label="数据来源" prop="platCode">
-          <el-input v-model="dataForm.platCode" placeholder="数据来源"></el-input>
+          <el-input v-model.trim="dataForm.platCode" placeholder="数据来源"></el-input>
       </el-form-item>
     </el-form>
     <template slot="footer">
diff --git a/src/views/modules/cabaseinfo/caloudong.vue b/src/views/modules/cabaseinfo/caloudong.vue
index 4e14bafea..11b406da9 100644
--- a/src/views/modules/cabaseinfo/caloudong.vue
+++ b/src/views/modules/cabaseinfo/caloudong.vue
@@ -3,7 +3,7 @@
     <el-card>
       <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
         <el-form-item label="所属网格" prop="gridId">
-            <el-select v-model="dataForm.gridId" filterable placeholder="请选择" clearable>
+            <el-select v-model.trim="dataForm.gridId" filterable placeholder="请选择" clearable>
               <el-option
                 v-for="item in optionsG"
                 :key="item.value"
@@ -14,21 +14,21 @@
          </el-form-item>
         <el-form-item label="楼宇名称" prop="buildingName">
           <el-input
-            v-model="dataForm.buildingName"
+            v-model.trim="dataForm.buildingName"
             placeholder="楼宇名称"
             clearable
           ></el-input>
         </el-form-item>
         <el-form-item label="小区（单位）名称" prop="communityName">
           <el-input
-            v-model="dataForm.communityName"
+            v-model.trim="dataForm.communityName"
             placeholder="小区（单位）名称"
             clearable
           ></el-input>
         </el-form-item>
         <el-form-item label="所处位置" prop="buildingAddr">
           <el-input
-            v-model="dataForm.buildingAddr"
+            v-model.trim="dataForm.buildingAddr"
             placeholder="所处位置"
             clearable
           ></el-input>
diff --git a/src/views/modules/cabaseinfo/capingfang-add-or-update.vue b/src/views/modules/cabaseinfo/capingfang-add-or-update.vue
index 754226597..2a0d74858 100644
--- a/src/views/modules/cabaseinfo/capingfang-add-or-update.vue
+++ b/src/views/modules/cabaseinfo/capingfang-add-or-update.vue
@@ -2,76 +2,76 @@
   <el-dialog :visible.sync="visible" :title="!dataForm.id ? $t('add') : $t('查看')" :close-on-click-modal="false" :close-on-press-escape="false">
     <el-form :disabled="true" :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" :label-width="$i18n.locale === 'en-US' ? '120px' : '80px'">
       <el-form-item label="楼宇类型" prop="buildingType">
-          <el-input v-model="dataForm.buildingType" placeholder="楼宇类型"></el-input>
+          <el-input v-model.trim="dataForm.buildingType" placeholder="楼宇类型"></el-input>
       </el-form-item>
       <el-form-item label="楼宇名称" prop="buildingName">
-          <el-input v-model="dataForm.buildingName" placeholder="楼宇名称"></el-input>
+          <el-input v-model.trim="dataForm.buildingName" placeholder="楼宇名称"></el-input>
       </el-form-item>
       <el-form-item label="用途分类" prop="buildingUse">
-          <el-input v-model="dataForm.buildingUse" placeholder="用途分类"></el-input>
+          <el-input v-model.trim="dataForm.buildingUse" placeholder="用途分类"></el-input>
       </el-form-item>
       <el-form-item label="楼宇状态" prop="buildingStatus">
-          <el-input v-model="dataForm.buildingStatus" placeholder="楼宇状态"></el-input>
+          <el-input v-model.trim="dataForm.buildingStatus" placeholder="楼宇状态"></el-input>
       </el-form-item>
       <el-form-item label="楼宇结构" prop="buildingStructure">
-          <el-input v-model="dataForm.buildingStructure" placeholder="楼宇结构"></el-input>
+          <el-input v-model.trim="dataForm.buildingStructure" placeholder="楼宇结构"></el-input>
       </el-form-item>
       <el-form-item label="使用现状" prop="buildingUseage">
-          <el-input v-model="dataForm.buildingUseage" placeholder="使用现状"></el-input>
+          <el-input v-model.trim="dataForm.buildingUseage" placeholder="使用现状"></el-input>
       </el-form-item>
       <el-form-item label="建筑时间" prop="constructionTime">
-          <el-input v-model="dataForm.constructionTime" placeholder="建筑时间"></el-input>
+          <el-input v-model.trim="dataForm.constructionTime" placeholder="建筑时间"></el-input>
       </el-form-item>
       <el-form-item label="所处位置" prop="buildingAddr">
-          <el-input v-model="dataForm.buildingAddr" placeholder="所处位置"></el-input>
+          <el-input v-model.trim="dataForm.buildingAddr" placeholder="所处位置"></el-input>
       </el-form-item>
       <el-form-item label="小区（单位）名称" prop="communityName">
-          <el-input v-model="dataForm.communityName" placeholder="小区（单位）名称"></el-input>
+          <el-input v-model.trim="dataForm.communityName" placeholder="小区（单位）名称"></el-input>
       </el-form-item>
       <el-form-item label="楼栋长" prop="buildingLeader">
-          <el-input v-model="dataForm.buildingLeader" placeholder="楼栋长"></el-input>
+          <el-input v-model.trim="dataForm.buildingLeader" placeholder="楼栋长"></el-input>
       </el-form-item>
       <el-form-item label="楼层数" prop="layerCount">
-          <el-input v-model="dataForm.layerCount" placeholder="楼层数"></el-input>
+          <el-input v-model.trim="dataForm.layerCount" placeholder="楼层数"></el-input>
       </el-form-item>
       <el-form-item label="地下楼层数" prop="basementLayerCount">
-          <el-input v-model="dataForm.basementLayerCount" placeholder="地下楼层数"></el-input>
+          <el-input v-model.trim="dataForm.basementLayerCount" placeholder="地下楼层数"></el-input>
       </el-form-item>
       <el-form-item label="住宅开始层数" prop="houseBeginLayer">
-          <el-input v-model="dataForm.houseBeginLayer" placeholder="住宅开始层数"></el-input>
+          <el-input v-model.trim="dataForm.houseBeginLayer" placeholder="住宅开始层数"></el-input>
       </el-form-item>
       <el-form-item label="单元数" prop="unitCount">
-          <el-input v-model="dataForm.unitCount" placeholder="单元数"></el-input>
+          <el-input v-model.trim="dataForm.unitCount" placeholder="单元数"></el-input>
       </el-form-item>
       <el-form-item label="每层每单元户数" prop="layerRoomCount">
-          <el-input v-model="dataForm.layerRoomCount" placeholder="每层每单元户数"></el-input>
+          <el-input v-model.trim="dataForm.layerRoomCount" placeholder="每层每单元户数"></el-input>
       </el-form-item>
       <el-form-item label="总房屋数" prop="roomCount">
-          <el-input v-model="dataForm.roomCount" placeholder="总房屋数"></el-input>
+          <el-input v-model.trim="dataForm.roomCount" placeholder="总房屋数"></el-input>
       </el-form-item>
       <el-form-item label="电梯数量" prop="elevatorCount">
-          <el-input v-model="dataForm.elevatorCount" placeholder="电梯数量"></el-input>
+          <el-input v-model.trim="dataForm.elevatorCount" placeholder="电梯数量"></el-input>
       </el-form-item>
       <el-form-item label="建筑面积" prop="buildingArea">
-          <el-input v-model="dataForm.buildingArea" placeholder="建筑面积"></el-input>
+          <el-input v-model.trim="dataForm.buildingArea" placeholder="建筑面积"></el-input>
       </el-form-item>
       <el-form-item label="物业公司" prop="buildingPmc">
-          <el-input v-model="dataForm.buildingPmc" placeholder="物业公司"></el-input>
+          <el-input v-model.trim="dataForm.buildingPmc" placeholder="物业公司"></el-input>
       </el-form-item>
       <el-form-item label="介绍" prop="buildingDesc">
-          <el-input v-model="dataForm.buildingDesc" placeholder="介绍"></el-input>
+          <el-input v-model.trim="dataForm.buildingDesc" placeholder="介绍"></el-input>
       </el-form-item>
       <el-form-item label="标绘状态" prop="pointStatus">
-          <el-input v-model="dataForm.pointStatus" placeholder="标绘状态"></el-input>
+          <el-input v-model.trim="dataForm.pointStatus" placeholder="标绘状态"></el-input>
       </el-form-item>
       <el-form-item label="经度" prop="longitude">
-          <el-input v-model="dataForm.longitude" placeholder="经度"></el-input>
+          <el-input v-model.trim="dataForm.longitude" placeholder="经度"></el-input>
       </el-form-item>
       <el-form-item label="纬度" prop="latitude">
-          <el-input v-model="dataForm.latitude" placeholder="纬度"></el-input>
+          <el-input v-model.trim="dataForm.latitude" placeholder="纬度"></el-input>
       </el-form-item>
       <el-form-item label="数据来源" prop="platCode">
-          <el-input v-model="dataForm.platCode" placeholder="数据来源"></el-input>
+          <el-input v-model.trim="dataForm.platCode" placeholder="数据来源"></el-input>
       </el-form-item>
     </el-form>
     <template slot="footer">
diff --git a/src/views/modules/cabaseinfo/capingfang.vue b/src/views/modules/cabaseinfo/capingfang.vue
index 4416b96c9..154de1f22 100644
--- a/src/views/modules/cabaseinfo/capingfang.vue
+++ b/src/views/modules/cabaseinfo/capingfang.vue
@@ -3,7 +3,7 @@
     <el-card>
       <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
         <el-form-item label="所属网格" prop="gridId">
-            <el-select v-model="dataForm.gridId" filterable placeholder="请选择" clearable>
+            <el-select v-model.trim="dataForm.gridId" filterable placeholder="请选择" clearable>
               <el-option
                 v-for="item in optionsG"
                 :key="item.value"
@@ -14,21 +14,21 @@
          </el-form-item>
         <el-form-item label="楼宇名称" prop="buildingName">
           <el-input
-            v-model="dataForm.buildingName"
+            v-model.trim="dataForm.buildingName"
             placeholder="楼宇名称"
             clearable
           ></el-input>
         </el-form-item>
         <el-form-item label="小区（单位）名称" prop="communityName">
           <el-input
-            v-model="dataForm.communityName"
+            v-model.trim="dataForm.communityName"
             placeholder="小区（单位）名称"
             clearable
           ></el-input>
         </el-form-item>
         <el-form-item label="所处位置" prop="buildingAddr">
           <el-input
-            v-model="dataForm.buildingAddr"
+            v-model.trim="dataForm.buildingAddr"
             placeholder="所处位置"
             clearable
           ></el-input>
diff --git a/src/views/modules/cabaseinfo/carental-add-or-update.vue b/src/views/modules/cabaseinfo/carental-add-or-update.vue
index 2364bb101..3ece7c311 100644
--- a/src/views/modules/cabaseinfo/carental-add-or-update.vue
+++ b/src/views/modules/cabaseinfo/carental-add-or-update.vue
@@ -2,58 +2,58 @@
   <el-dialog :visible.sync="visible" :title="!dataForm.id ? $t('add') : $t('查看')" :close-on-click-modal="false" :close-on-press-escape="false">
     <el-form :disabled="true" :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" :label-width="$i18n.locale === 'en-US' ? '120px' : '80px'">
       <el-form-item label="房屋编号" prop="houseName">
-          <el-input v-model="dataForm.houseName" placeholder="房屋编号"></el-input>
+          <el-input v-model.trim="dataForm.houseName" placeholder="房屋编号"></el-input>
       </el-form-item>
       <el-form-item label="房屋地址" prop="houseAddress">
-          <el-input v-model="dataForm.houseAddress" placeholder="房屋地址"></el-input>
+          <el-input v-model.trim="dataForm.houseAddress" placeholder="房屋地址"></el-input>
       </el-form-item>
       <el-form-item label="建筑用途" prop="houseUse">
-          <el-input v-model="dataForm.houseUse" placeholder="建筑用途"></el-input>
+          <el-input v-model.trim="dataForm.houseUse" placeholder="建筑用途"></el-input>
       </el-form-item>
       <el-form-item label="建筑面积（平方米）" prop="houseArea">
-          <el-input v-model="dataForm.houseArea" placeholder="建筑面积（平方米）"></el-input>
+          <el-input v-model.trim="dataForm.houseArea" placeholder="建筑面积（平方米）"></el-input>
       </el-form-item>
       <el-form-item label="证件代码" prop="idType">
-          <el-input v-model="dataForm.idType" placeholder="证件代码"></el-input>
+          <el-input v-model.trim="dataForm.idType" placeholder="证件代码"></el-input>
       </el-form-item>
       <el-form-item label="证件号码" prop="idCard">
-          <el-input v-model="dataForm.idCard" placeholder="证件号码"></el-input>
+          <el-input v-model.trim="dataForm.idCard" placeholder="证件号码"></el-input>
       </el-form-item>
       <el-form-item label="房主姓名" prop="residentName">
-          <el-input v-model="dataForm.residentName" placeholder="房主姓名"></el-input>
+          <el-input v-model.trim="dataForm.residentName" placeholder="房主姓名"></el-input>
       </el-form-item>
       <el-form-item label="房主联系方式" prop="telephone">
-          <el-input v-model="dataForm.telephone" placeholder="房主联系方式"></el-input>
+          <el-input v-model.trim="dataForm.telephone" placeholder="房主联系方式"></el-input>
       </el-form-item>
       <el-form-item label="房主现居详址" prop="curliveAddress">
-          <el-input v-model="dataForm.curliveAddress" placeholder="房主现居详址"></el-input>
+          <el-input v-model.trim="dataForm.curliveAddress" placeholder="房主现居详址"></el-input>
       </el-form-item>
       <el-form-item label="出租用途" prop="rentUse">
-          <el-input v-model="dataForm.rentUse" placeholder="出租用途"></el-input>
+          <el-input v-model.trim="dataForm.rentUse" placeholder="出租用途"></el-input>
       </el-form-item>
       <el-form-item label="隐患类型" prop="troubleType">
-          <el-input v-model="dataForm.troubleType" placeholder="隐患类型"></el-input>
+          <el-input v-model.trim="dataForm.troubleType" placeholder="隐患类型"></el-input>
       </el-form-item>
       <el-form-item label="承租人公民证件号码" prop="renterCardNumber">
-          <el-input v-model="dataForm.renterCardNumber" placeholder="承租人公民证件号码"></el-input>
+          <el-input v-model.trim="dataForm.renterCardNumber" placeholder="承租人公民证件号码"></el-input>
       </el-form-item>
       <el-form-item label="承租人证件类型" prop="renterCardType">
-          <el-input v-model="dataForm.renterCardType" placeholder="承租人证件类型"></el-input>
+          <el-input v-model.trim="dataForm.renterCardType" placeholder="承租人证件类型"></el-input>
       </el-form-item>
       <el-form-item label="承租人姓名" prop="renterName">
-          <el-input v-model="dataForm.renterName" placeholder="承租人姓名"></el-input>
+          <el-input v-model.trim="dataForm.renterName" placeholder="承租人姓名"></el-input>
       </el-form-item>
       <el-form-item label="承租人联系方式" prop="renterPhone">
-          <el-input v-model="dataForm.renterPhone" placeholder="承租人联系方式"></el-input>
+          <el-input v-model.trim="dataForm.renterPhone" placeholder="承租人联系方式"></el-input>
       </el-form-item>
       <el-form-item label="经度" prop="longitude">
-          <el-input v-model="dataForm.longitude" placeholder="经度"></el-input>
+          <el-input v-model.trim="dataForm.longitude" placeholder="经度"></el-input>
       </el-form-item>
       <el-form-item label="纬度" prop="latitude">
-          <el-input v-model="dataForm.latitude" placeholder="纬度"></el-input>
+          <el-input v-model.trim="dataForm.latitude" placeholder="纬度"></el-input>
       </el-form-item>
       <el-form-item label="标绘状态" prop="pointStatus">
-          <el-input v-model="dataForm.pointStatus" placeholder="标绘状态"></el-input>
+          <el-input v-model.trim="dataForm.pointStatus" placeholder="标绘状态"></el-input>
       </el-form-item>
     </el-form>
     <template slot="footer">
diff --git a/src/views/modules/cabaseinfo/carental.vue b/src/views/modules/cabaseinfo/carental.vue
index c22dee647..8c0032f60 100644
--- a/src/views/modules/cabaseinfo/carental.vue
+++ b/src/views/modules/cabaseinfo/carental.vue
@@ -3,7 +3,7 @@
     <el-card>
       <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
         <el-form-item label="所属网格" prop="gridId">
-            <el-select v-model="dataForm.gridId" filterable placeholder="请选择" clearable>
+            <el-select v-model.trim="dataForm.gridId" filterable placeholder="请选择" clearable>
               <el-option
                 v-for="item in optionsG"
                 :key="item.value"
@@ -14,28 +14,28 @@
          </el-form-item>
         <el-form-item label="房屋编号" prop="houseName">
           <el-input
-            v-model="dataForm.houseName"
+            v-model.trim="dataForm.houseName"
             placeholder="房屋编号"
             clearable
           ></el-input>
         </el-form-item>
         <el-form-item label="房主姓名" prop="residentName">
           <el-input
-            v-model="dataForm.residentName"
+            v-model.trim="dataForm.residentName"
             placeholder="房主姓名"
             clearable
           ></el-input>
         </el-form-item>
         <el-form-item label="承租人姓名" prop="renterName">
           <el-input
-            v-model="dataForm.renterName"
+            v-model.trim="dataForm.renterName"
             placeholder="承租人姓名"
             clearable
           ></el-input>
         </el-form-item>
         <el-form-item label="房屋地址" prop="houseAddress">
           <el-input
-            v-model="dataForm.houseAddress"
+            v-model.trim="dataForm.houseAddress"
             placeholder="房屋地址"
             clearable
           ></el-input>
diff --git a/src/views/modules/cabaseinfo/caresident-add-or-update.vue b/src/views/modules/cabaseinfo/caresident-add-or-update.vue
index 1cafee1b8..73bca77be 100644
--- a/src/views/modules/cabaseinfo/caresident-add-or-update.vue
+++ b/src/views/modules/cabaseinfo/caresident-add-or-update.vue
@@ -2,55 +2,55 @@
   <el-dialog :visible.sync="visible" :title="!dataForm.residentId ? $t('add') : $t('查看')" :close-on-click-modal="false" :close-on-press-escape="false">
     <el-form disabled :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" :label-width="$i18n.locale === 'en-US' ? '120px' : '80px'">
       <el-form-item label="人口性质" prop="residentProperty">
-          <el-input v-model="dataForm.residentProperty" placeholder="人口性质"></el-input>
+          <el-input v-model.trim="dataForm.residentProperty" placeholder="人口性质"></el-input>
       </el-form-item>
       <el-form-item label="居民分类" prop="residentType">
-          <el-input v-model="dataForm.residentType" placeholder="居民分类"></el-input>
+          <el-input v-model.trim="dataForm.residentType" placeholder="居民分类"></el-input>
       </el-form-item>
       <el-form-item label="证件类型" prop="idType">
-          <el-input v-model="dataForm.idType" placeholder="证件类型"></el-input>
+          <el-input v-model.trim="dataForm.idType" placeholder="证件类型"></el-input>
       </el-form-item>
       <el-form-item label="证件号码（公民证件号）" prop="idCard">
-          <el-input v-model="dataForm.idCard" placeholder="证件号码（公民证件号）"></el-input>
+          <el-input v-model.trim="dataForm.idCard" placeholder="证件号码（公民证件号）"></el-input>
       </el-form-item>
       <el-form-item label="姓名" prop="residentName">
-          <el-input v-model="dataForm.residentName" placeholder="姓名"></el-input>
+          <el-input v-model.trim="dataForm.residentName" placeholder="姓名"></el-input>
       </el-form-item>
       <el-form-item label="性别" prop="sex">
-          <el-input v-model="dataForm.sex" placeholder="性别"></el-input>
+          <el-input v-model.trim="dataForm.sex" placeholder="性别"></el-input>
       </el-form-item>
       <el-form-item label="出生日期" prop="birthday">
-          <el-input v-model="dataForm.birthday" placeholder="出生日期"></el-input>
+          <el-input v-model.trim="dataForm.birthday" placeholder="出生日期"></el-input>
       </el-form-item>
       <el-form-item label="民族" prop="nation">
-          <el-input v-model="dataForm.nation" placeholder="民族"></el-input>
+          <el-input v-model.trim="dataForm.nation" placeholder="民族"></el-input>
       </el-form-item>
       <el-form-item label="联系方式" prop="telephone">
-          <el-input v-model="dataForm.telephone" placeholder="联系方式"></el-input>
+          <el-input v-model.trim="dataForm.telephone" placeholder="联系方式"></el-input>
       </el-form-item>
       <el-form-item label="户籍详址" prop="householdAddressDetail">
-          <el-input v-model="dataForm.householdAddressDetail" placeholder="户籍详址"></el-input>
+          <el-input v-model.trim="dataForm.householdAddressDetail" placeholder="户籍详址"></el-input>
       </el-form-item>
       <el-form-item label="现住详址" prop="curliveAddressDetail">
-          <el-input v-model="dataForm.curliveAddressDetail" placeholder="现住详址"></el-input>
+          <el-input v-model.trim="dataForm.curliveAddressDetail" placeholder="现住详址"></el-input>
       </el-form-item>
       <el-form-item label="学历" prop="education">
-          <el-input v-model="dataForm.education" placeholder="学历"></el-input>
+          <el-input v-model.trim="dataForm.education" placeholder="学历"></el-input>
       </el-form-item>
       <el-form-item label="职业" prop="occupation">
-          <el-input v-model="dataForm.occupation" placeholder="职业"></el-input>
+          <el-input v-model.trim="dataForm.occupation" placeholder="职业"></el-input>
       </el-form-item>
       <el-form-item label="婚姻状况" prop="marriageStatus">
-          <el-input v-model="dataForm.marriageStatus" placeholder="婚姻状况"></el-input>
+          <el-input v-model.trim="dataForm.marriageStatus" placeholder="婚姻状况"></el-input>
       </el-form-item>
       <el-form-item label="政治面貌" prop="party">
-          <el-input v-model="dataForm.party" placeholder="政治面貌"></el-input>
+          <el-input v-model.trim="dataForm.party" placeholder="政治面貌"></el-input>
       </el-form-item>
       <el-form-item label="宗教信仰" prop="religious">
-          <el-input v-model="dataForm.religious" placeholder="宗教信仰"></el-input>
+          <el-input v-model.trim="dataForm.religious" placeholder="宗教信仰"></el-input>
       </el-form-item>
       <el-form-item label="有无皈依（已受洗）" prop="conversionState">
-          <el-input v-model="dataForm.conversionState" placeholder="有无皈依（已受洗）"></el-input>
+          <el-input v-model.trim="dataForm.conversionState" placeholder="有无皈依（已受洗）"></el-input>
       </el-form-item>
     </el-form>
     <template slot="footer">
diff --git a/src/views/modules/cabaseinfo/caresident.vue b/src/views/modules/cabaseinfo/caresident.vue
index a4a424f65..aecc1008d 100644
--- a/src/views/modules/cabaseinfo/caresident.vue
+++ b/src/views/modules/cabaseinfo/caresident.vue
@@ -3,7 +3,7 @@
     <el-card>
       <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
         <el-form-item label="所属网格" prop="gridId">
-            <el-select v-model="dataForm.gridId" filterable placeholder="请选择" clearable>
+            <el-select v-model.trim="dataForm.gridId" filterable placeholder="请选择" clearable>
               <el-option
                 v-for="item in optionsG"
                 :key="item.value"
@@ -13,25 +13,25 @@
             </el-select>
          </el-form-item>
         <el-form-item label="证件号" prop="idCard">
-          <el-input v-model="dataForm.idCard" placeholder="证件号" clearable></el-input>
+          <el-input v-model.trim="dataForm.idCard" placeholder="证件号" clearable></el-input>
         </el-form-item>
         <el-form-item label="姓名" prop="residentName">
           <el-input
-            v-model="dataForm.residentName"
+            v-model.trim="dataForm.residentName"
             placeholder="姓名"
             clearable
           ></el-input>
         </el-form-item>
         <el-form-item label="联系方式" prop="telephone">
           <el-input
-            v-model="dataForm.telephone"
+            v-model.trim="dataForm.telephone"
             placeholder="联系方式"
             clearable
           ></el-input>
         </el-form-item>
         <el-form-item label="现居住地址" prop="curliveAddressDetail">
           <el-input
-            v-model="dataForm.curliveAddressDetail"
+            v-model.trim="dataForm.curliveAddressDetail"
             placeholder="现居住地址"
             clearable
           ></el-input>
diff --git a/src/views/modules/cabaseinfo/carotators-add-or-update.vue b/src/views/modules/cabaseinfo/carotators-add-or-update.vue
index 5d698ff90..f7ff26c8d 100644
--- a/src/views/modules/cabaseinfo/carotators-add-or-update.vue
+++ b/src/views/modules/cabaseinfo/carotators-add-or-update.vue
@@ -2,58 +2,58 @@
   <el-dialog :visible.sync="visible" :title="!dataForm.id ? $t('add') : $t('查看')" :close-on-click-modal="false" :close-on-press-escape="false">
     <el-form :disabled="true" :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" :label-width="$i18n.locale === 'en-US' ? '120px' : '80px'">
       <el-form-item label="公民证件号" prop="idCard">
-          <el-input v-model="dataForm.idCard" placeholder="公民证件号"></el-input>
+          <el-input v-model.trim="dataForm.idCard" placeholder="公民证件号"></el-input>
       </el-form-item>
       <el-form-item label="证件类型" prop="idType">
-          <el-input v-model="dataForm.idType" placeholder="证件类型"></el-input>
+          <el-input v-model.trim="dataForm.idType" placeholder="证件类型"></el-input>
       </el-form-item>
           <el-form-item label="姓名" prop="rotatorsName">
-          <el-input v-model="dataForm.rotatorsName" placeholder="姓名"></el-input>
+          <el-input v-model.trim="dataForm.rotatorsName" placeholder="姓名"></el-input>
       </el-form-item>
       <el-form-item label="曾用名" prop="formerName">
-          <el-input v-model="dataForm.formerName" placeholder="曾用名"></el-input>
+          <el-input v-model.trim="dataForm.formerName" placeholder="曾用名"></el-input>
       </el-form-item>
       <el-form-item label="性别" prop="sex">
-          <el-input v-model="dataForm.sex" placeholder="性别"></el-input>
+          <el-input v-model.trim="dataForm.sex" placeholder="性别"></el-input>
       </el-form-item>
       <el-form-item label="出生日期" prop="birthday">
-          <el-input v-model="dataForm.birthday" placeholder="出生日期"></el-input>
+          <el-input v-model.trim="dataForm.birthday" placeholder="出生日期"></el-input>
       </el-form-item>
       <el-form-item label="民族" prop="nation">
-          <el-input v-model="dataForm.nation" placeholder="民族"></el-input>
+          <el-input v-model.trim="dataForm.nation" placeholder="民族"></el-input>
       </el-form-item>
       <el-form-item label="婚姻状况" prop="marriageStatus">
-          <el-input v-model="dataForm.marriageStatus" placeholder="婚姻状况"></el-input>
+          <el-input v-model.trim="dataForm.marriageStatus" placeholder="婚姻状况"></el-input>
       </el-form-item>
       <el-form-item label="政治面貌" prop="party">
-          <el-input v-model="dataForm.party" placeholder="政治面貌"></el-input>
+          <el-input v-model.trim="dataForm.party" placeholder="政治面貌"></el-input>
       </el-form-item>
       <el-form-item label="学历" prop="education">
-          <el-input v-model="dataForm.education" placeholder="学历"></el-input>
+          <el-input v-model.trim="dataForm.education" placeholder="学历"></el-input>
       </el-form-item>
       <el-form-item label="宗教信仰" prop="religious">
-          <el-input v-model="dataForm.religious" placeholder="宗教信仰"></el-input>
+          <el-input v-model.trim="dataForm.religious" placeholder="宗教信仰"></el-input>
       </el-form-item>
       <el-form-item label="职业类别" prop="occupationType">
-          <el-input v-model="dataForm.occupationType" placeholder="职业类别"></el-input>
+          <el-input v-model.trim="dataForm.occupationType" placeholder="职业类别"></el-input>
       </el-form-item>
       <el-form-item label="职业" prop="occupation">
-          <el-input v-model="dataForm.occupation" placeholder="职业"></el-input>
+          <el-input v-model.trim="dataForm.occupation" placeholder="职业"></el-input>
       </el-form-item>
       <el-form-item label="联系方式" prop="telephone">
-          <el-input v-model="dataForm.telephone" placeholder="联系方式"></el-input>
+          <el-input v-model.trim="dataForm.telephone" placeholder="联系方式"></el-input>
       </el-form-item>
       <el-form-item label="户籍门(楼)详址" prop="householdAddressDetail">
-          <el-input v-model="dataForm.householdAddressDetail" placeholder="户籍门(楼)详址"></el-input>
+          <el-input v-model.trim="dataForm.householdAddressDetail" placeholder="户籍门(楼)详址"></el-input>
       </el-form-item>
       <el-form-item label="现住地社区/村" prop="curliveAddressVillage">
-          <el-input v-model="dataForm.curliveAddressVillage" placeholder="现住地社区/村"></el-input>
+          <el-input v-model.trim="dataForm.curliveAddressVillage" placeholder="现住地社区/村"></el-input>
       </el-form-item>
       <el-form-item label="现住门(楼)详址" prop="curliveAddressDetail">
-          <el-input v-model="dataForm.curliveAddressDetail" placeholder="现住门(楼)详址"></el-input>
+          <el-input v-model.trim="dataForm.curliveAddressDetail" placeholder="现住门(楼)详址"></el-input>
       </el-form-item>
       <el-form-item label="是否重点关注人员" prop="isFocusPerson">
-          <el-input v-model="dataForm.isFocusPerson" placeholder="是否重点关注人员"></el-input>
+          <el-input v-model.trim="dataForm.isFocusPerson" placeholder="是否重点关注人员"></el-input>
       </el-form-item>
     </el-form>
     <template slot="footer">
diff --git a/src/views/modules/cabaseinfo/carotators-binding-house.vue b/src/views/modules/cabaseinfo/carotators-binding-house.vue
index bec53eee0..b5393d5cb 100644
--- a/src/views/modules/cabaseinfo/carotators-binding-house.vue
+++ b/src/views/modules/cabaseinfo/carotators-binding-house.vue
@@ -9,7 +9,7 @@
                 <!-- <el-dropdown
                   class="select"
                   placement="bottom"
-                  v-model="searchData.type"
+                  v-model.trim="searchData.type"
                   @command="(type) => (searchData.type = type)"
                 >
                   <span class="select-show">
@@ -21,7 +21,7 @@
                 <input
                   type="text"
                   :placeholder="typePlaceholder[searchData.type]"
-                  v-model="searchData.keyword"
+                  v-model.trim="searchData.keyword"
                   @keyup.enter="handleClickSearchBtn"
                 />
 
diff --git a/src/views/modules/cabaseinfo/carotators.vue b/src/views/modules/cabaseinfo/carotators.vue
index 8a6973bd6..79052b2c8 100644
--- a/src/views/modules/cabaseinfo/carotators.vue
+++ b/src/views/modules/cabaseinfo/carotators.vue
@@ -3,7 +3,7 @@
     <el-card>
       <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
         <el-form-item label="所属网格" prop="gridId">
-            <el-select v-model="dataForm.gridId" filterable placeholder="请选择" clearable>
+            <el-select v-model.trim="dataForm.gridId" filterable placeholder="请选择" clearable>
               <el-option
                 v-for="item in optionsG"
                 :key="item.value"
@@ -13,25 +13,25 @@
             </el-select>
          </el-form-item>
         <el-form-item label="证件号" prop="idCard">
-          <el-input v-model="dataForm.idCard" placeholder="证件号" clearable></el-input>
+          <el-input v-model.trim="dataForm.idCard" placeholder="证件号" clearable></el-input>
         </el-form-item>
         <el-form-item label="姓名" prop="residentName">
           <el-input
-            v-model="dataForm.residentName"
+            v-model.trim="dataForm.residentName"
             placeholder="姓名"
             clearable
           ></el-input>
         </el-form-item>
         <el-form-item label="联系方式" prop="telephone">
           <el-input
-            v-model="dataForm.telephone"
+            v-model.trim="dataForm.telephone"
             placeholder="联系方式"
             clearable
           ></el-input>
         </el-form-item>
         <el-form-item label="现居住地址" prop="curliveAddressDetail">
           <el-input
-            v-model="dataForm.curliveAddressDetail"
+            v-model.trim="dataForm.curliveAddressDetail"
             placeholder="现居住地址"
             clearable
           ></el-input>
diff --git a/src/views/modules/cabaseinfo/wghSjxxb.vue b/src/views/modules/cabaseinfo/wghSjxxb.vue
index cfbb60c3a..e28d48b01 100644
--- a/src/views/modules/cabaseinfo/wghSjxxb.vue
+++ b/src/views/modules/cabaseinfo/wghSjxxb.vue
@@ -4,21 +4,21 @@
       <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
         <el-form-item label="上报人姓名" prop="wgy">
           <el-input
-            v-model="dataForm.wgy"
+            v-model.trim="dataForm.wgy"
             placeholder="上报人姓名"
             clearable
           ></el-input>
         </el-form-item>
         <el-form-item label="网格名称" prop="griddingname">
           <el-input
-            v-model="dataForm.griddingname"
+            v-model.trim="dataForm.griddingname"
             placeholder="网格名称"
             clearable
           ></el-input>
         </el-form-item>
         <el-form-item label="事件名称" prop="eventtitle">
           <el-input
-            v-model="dataForm.eventtitle"
+            v-model.trim="dataForm.eventtitle"
             placeholder="事件名称"
             clearable
           ></el-input>
@@ -121,28 +121,28 @@
         <el-form-item label="事件来源:">
 					<el-input
 						style="width:300px;margin-left:20px"
-						v-model="detailForm.eventsource"
+						v-model.trim="detailForm.eventsource"
 						:disabled="true">
 					</el-input>
         </el-form-item>
         <el-form-item label="上报人:">
 					<el-input
 						style="width:300px;margin-left:20px"
-						v-model="detailForm.wgy"
+						v-model.trim="detailForm.wgy"
 						:disabled="true">
 					</el-input>
         </el-form-item>
         <el-form-item label="办结方式:">
 					<el-input
 						style="width:300px;margin-left:20px"
-						v-model="detailForm.finishedmethod"
+						v-model.trim="detailForm.finishedmethod"
 						:disabled="true">
 					</el-input>
         </el-form-item>
         <el-form-item label="网格名称:">
           <el-input
             style="width:300px;margin-left:20px"
-            v-model="detailForm.griddingname"
+            v-model.trim="detailForm.griddingname"
             :disabled="true">
           </el-input>
         </el-form-item>
@@ -150,7 +150,7 @@
 					<el-input
             type="textarea"
 						style="width:300px;margin-left:20px"
-						v-model="detailForm.eventtitle"
+						v-model.trim="detailForm.eventtitle"
 						:disabled="true">
 					</el-input>
         </el-form-item>
@@ -158,7 +158,7 @@
           <el-input
             type="textarea"
             style="width:300px;margin-left:20px"
-            v-model="detailForm.eventaddrdetail"
+            v-model.trim="detailForm.eventaddrdetail"
             :disabled="true">
           </el-input>
         </el-form-item>
@@ -166,28 +166,28 @@
 					<el-input
 						type="textarea"
             style="width:300px;margin-left:20px"
-						v-model="detailForm.eventtext"
+						v-model.trim="detailForm.eventtext"
 						:disabled="true">
 					</el-input>
         </el-form-item>
         <el-form-item label="发生日期:">
           <el-input
             style="width:300px;margin-left:20px"
-            v-model="detailForm.eventdate"
+            v-model.trim="detailForm.eventdate"
             :disabled="true">
           </el-input>
         </el-form-item>
         <el-form-item label="事件状态:">
 					<el-input
 						style="width:300px;margin-left:20px"
-						v-model="detailForm.curstatus"
+						v-model.trim="detailForm.curstatus"
 						:disabled="true">
 					</el-input>
         </el-form-item>
         <el-form-item label="是否已抽取:">
 					<el-input
 						style="width:300px;margin-left:20px"
-						v-model="detailForm.isExtracted"
+						v-model.trim="detailForm.isExtracted"
 						:disabled="true">
 					</el-input>
         </el-form-item>
diff --git a/src/views/modules/commonDemand/commonDemandForm.vue b/src/views/modules/commonDemand/commonDemandForm.vue
index 7306b839d..35d92b53c 100644
--- a/src/views/modules/commonDemand/commonDemandForm.vue
+++ b/src/views/modules/commonDemand/commonDemandForm.vue
@@ -9,13 +9,13 @@
                    label-width="150px"
                    class="g-edit-form">
             <el-form-item prop="name" label="名称">
-                <el-input v-model="dataForm.name" placeholder="请输入名称" ></el-input>
+                <el-input v-model.trim="dataForm.name" placeholder="请输入名称" ></el-input>
             </el-form-item>
             <el-form-item prop="sort" :label="$t('dept.sort')">
-                <el-input-number v-model="dataForm.sort" @change="handleChangeSortNum" :min="0" :label="$t('dept.sort')" ></el-input-number>
+                <el-input-number v-model.trim="dataForm.sort" @change="handleChangeSortNum" :min="0" :label="$t('dept.sort')" ></el-input-number>
             </el-form-item>
             <el-form-item prop="awardPoint" label="奖励积分" v-if="this.isParentLevel == false">
-                <el-input-number v-model="dataForm.awardPoint" @change="handleChangeAwardPoint" :min="0" label="奖励积分" ></el-input-number>
+                <el-input-number v-model.trim="dataForm.awardPoint" @change="handleChangeAwardPoint" :min="0" label="奖励积分" ></el-input-number>
             </el-form-item>
           </el-form>
         </div>
diff --git a/src/views/modules/communityParty/article/cpts/offline.vue b/src/views/modules/communityParty/article/cpts/offline.vue
index 8a5eee901..0347677e2 100644
--- a/src/views/modules/communityParty/article/cpts/offline.vue
+++ b/src/views/modules/communityParty/article/cpts/offline.vue
@@ -26,7 +26,7 @@
           style="display: block"
         >
           <el-cascader
-            v-model="fmData.gridIdList"
+            v-model.trim="fmData.gridIdList"
             placeholder="请选择"
             :options="gridOptions"
             :props="{
diff --git a/src/views/modules/communityParty/calendar/index.vue b/src/views/modules/communityParty/calendar/index.vue
index ec6458769..2fb79b779 100644
--- a/src/views/modules/communityParty/calendar/index.vue
+++ b/src/views/modules/communityParty/calendar/index.vue
@@ -9,7 +9,7 @@
                 class="customer_cascader"
                 ref="myCascader"
                 size="big"
-                v-model="fmData.orgId"
+                v-model.trim="fmData.orgId"
                 :options="partyOptions"
                 :props="partyOptionsProps"
                 :show-all-levels="false"
@@ -17,10 +17,10 @@
               ></el-cascader>
             </div>
             <div class="item">
-              <el-radio v-model="fmData.isSelf" label="1"
+              <el-radio v-model.trim="fmData.isSelf" label="1"
                 >本人创建的活动</el-radio
               >
-              <el-radio v-model="fmData.isSelf" label="0"
+              <el-radio v-model.trim="fmData.isSelf" label="0"
                 >本组织所有活动</el-radio
               >
             </div>
@@ -145,7 +145,7 @@
             <div class="hd">
               <div class="hd-year">
                 <el-date-picker
-                  v-model="currentYearStr"
+                  v-model.trim="currentYearStr"
                   value-format="yyyy"
                   type="year"
                   placeholder="选择年度"
diff --git a/src/views/modules/communityParty/elegant/detail.vue b/src/views/modules/communityParty/elegant/detail.vue
index 084305fd4..bd75108a6 100644
--- a/src/views/modules/communityParty/elegant/detail.vue
+++ b/src/views/modules/communityParty/elegant/detail.vue
@@ -72,7 +72,6 @@ export default {
   watch: {},
 
   async mounted () {
-    console.log('mounted-----我执行了')
 
   },
 
diff --git a/src/views/modules/communityParty/elegant/index.vue b/src/views/modules/communityParty/elegant/index.vue
index 6858b4921..03a3a82c4 100644
--- a/src/views/modules/communityParty/elegant/index.vue
+++ b/src/views/modules/communityParty/elegant/index.vue
@@ -10,7 +10,7 @@
                  class="demo-form-inline">
           <el-form-item label="所属网格"
                         prop="gridId">
-            <el-select v-model="searchForm.gridId"
+            <el-select v-model.trim="searchForm.gridId"
                        filterable
                        placeholder="请选择"
                        clearable>
@@ -23,7 +23,7 @@
           </el-form-item>
           <el-form-item label="分类类别"
                         prop="categoryId">
-            <el-select v-model="searchForm.categoryId"
+            <el-select v-model.trim="searchForm.categoryId"
                        filterable
                        placeholder="请选择"
                        clearable>
@@ -36,7 +36,7 @@
           </el-form-item>
           <el-form-item label="党员姓名"
                         prop="name">
-            <!-- <el-select v-model="searchForm.name" filterable placeholder="请选择" clearable>
+            <!-- <el-select v-model.trim="searchForm.name" filterable placeholder="请选择" clearable>
               <el-option
                 v-for="item in demandOptions"
                 :key="item.value"
@@ -44,14 +44,14 @@
                 :value="item.value">
               </el-option>
             </el-select> -->
-            <el-input v-model="searchForm.name"
+            <el-input v-model.trim="searchForm.name"
                       placeholder="请输入"
                       class="input-width"
                       clearable></el-input>
           </el-form-item>
           <el-form-item label="主要事迹"
                         prop="mainDeed">
-            <el-input v-model="searchForm.mainDeed"
+            <el-input v-model.trim="searchForm.mainDeed"
                       placeholder="请输入"
                       class="input-width"
                       clearable></el-input>
@@ -173,7 +173,7 @@
                class="form-wr dialog-h-content scroll-h">
         <el-form-item label="所属网格"
                       prop="gridId">
-          <el-select v-model="form.gridId"
+          <el-select v-model.trim="form.gridId"
                      filterable
                      :disabled="disabled"
                      placeholder="请选择"
@@ -189,7 +189,7 @@
         <el-form-item v-if="disabled"
                       label="分类类别"
                       prop="categoryId">
-          <el-select v-model="form.categoryId"
+          <el-select v-model.trim="form.categoryId"
                      filterable
                      :disabled="disabled"
                      placeholder="请选择"
@@ -205,7 +205,7 @@
         <el-form-item v-else
                       label="分类类别"
                       prop="categoryId">
-          <el-select v-model="form.categoryId"
+          <el-select v-model.trim="form.categoryId"
                      filterable
                      :disabled="disabled"
                      placeholder="请选择"
@@ -220,7 +220,7 @@
         </el-form-item>
         <el-form-item label="党员姓名"
                       prop="name">
-          <el-input v-model="form.name"
+          <el-input v-model.trim="form.name"
                     placeholder="请输入"
                     :disabled="disabled"
                     class="input-width"
@@ -228,7 +228,7 @@
         </el-form-item>
         <el-form-item label="主要事迹"
                       prop="mainDeed">
-          <el-input v-model="form.mainDeed"
+          <el-input v-model.trim="form.mainDeed"
                     :autosize="{ minRows: 10, maxRows: 10}"
                     :disabled="disabled"
                     type="textarea"
@@ -237,7 +237,7 @@
                     placeholder="请输入内容"></el-input>
         </el-form-item>
         <!-- <el-form-item label="状态">
-          <el-switch v-model="form.usableFlag"></el-switch>
+          <el-switch v-model.trim="form.usableFlag"></el-switch>
         </el-form-item> -->
         <el-form-item label="照片">
           <div class="imsg-list">
diff --git a/src/views/modules/communityParty/heart/heartAudit.vue b/src/views/modules/communityParty/heart/heartAudit.vue
index 94f1c8087..083af6573 100644
--- a/src/views/modules/communityParty/heart/heartAudit.vue
+++ b/src/views/modules/communityParty/heart/heartAudit.vue
@@ -117,7 +117,7 @@
                   show-word-limit
                   :rows="4"
                   placeholder="请输入拒绝理由"
-                  v-model="cancelReason"></el-input>
+                  v-model.trim="cancelReason"></el-input>
         <div style="display:flex;  justify-content: center;margin-top:20px">
           <el-button style="margin-left:30px"
                      size="small"
diff --git a/src/views/modules/communityParty/heart/heartFinish.vue b/src/views/modules/communityParty/heart/heartFinish.vue
index 2d5a68277..96f040b44 100644
--- a/src/views/modules/communityParty/heart/heartFinish.vue
+++ b/src/views/modules/communityParty/heart/heartFinish.vue
@@ -11,7 +11,7 @@
                       label-width="150px"
                       style="display: block"
                       prop="actualStartTime">
-          <el-date-picker v-model="formData.actualStartTime"
+          <el-date-picker v-model.trim="formData.actualStartTime"
                           class="list_item_width_3"
                           type="datetime"
                           value-format="yyyy-MM-dd HH:mm"
@@ -19,7 +19,7 @@
                           placeholder="开始时间">
           </el-date-picker>
           <span class="u-data-tag">至</span>
-          <el-date-picker v-model="formData.actualEndTime"
+          <el-date-picker v-model.trim="formData.actualEndTime"
                           class="list_item_width_3 u-data-tag"
                           type="datetime"
                           value-format="yyyy-MM-dd HH:mm"
@@ -87,9 +87,9 @@
 
               <template slot-scope="scope">
 
-                <el-radio v-model="scope.row.grantPointShow"
+                <el-radio v-model.trim="scope.row.grantPointShow"
                           label="1">给分</el-radio>
-                <el-radio v-model="scope.row.grantPointShow"
+                <el-radio v-model.trim="scope.row.grantPointShow"
                           label="2">不给分</el-radio>
 
               </template>
@@ -105,7 +105,7 @@
 
                 <el-input class="item_width_5"
                           placeholder="请输入理由"
-                          v-model="scope.row.denyRewardReason">
+                          v-model.trim="scope.row.denyRewardReason">
                 </el-input>
 
               </template>
diff --git a/src/views/modules/communityParty/heart/heartForm.vue b/src/views/modules/communityParty/heart/heartForm.vue
index fcf67fd98..6915f2fc2 100644
--- a/src/views/modules/communityParty/heart/heartForm.vue
+++ b/src/views/modules/communityParty/heart/heartForm.vue
@@ -15,14 +15,14 @@
               <el-cascader v-if="formData.richTextFlag || formType === 'add'"
                            class="item_width_6"
                            ref="myCascader"
-                           v-model="agencyIdArray"
+                           v-model.trim="agencyIdArray"
                            :options="orgOptions"
                            :props="orgOptionProps"
                            :show-all-levels="false"
                            @change="handleChangeAgency"></el-cascader>
               <el-input v-else
                         class="item_width_6"
-                        v-model="formData.sponsorName"></el-input>
+                        v-model.trim="formData.sponsorName"></el-input>
             </el-form-item>
 
             <el-form-item label="活动标题"
@@ -35,7 +35,7 @@
                         show-word-limit
                         :rows="2"
                         placeholder="请输入活动标题，不超过50字"
-                        v-model="formData.title"></el-input>
+                        v-model.trim="formData.title"></el-input>
             </el-form-item>
 
             <el-form-item label="封面"
@@ -61,7 +61,7 @@
             <el-form-item label="活动时间"
                           label-width="150px"
                           prop="actStartTime">
-              <el-date-picker v-model="formData.actStartTime"
+              <el-date-picker v-model.trim="formData.actStartTime"
                               class="list_item_width_3"
                               type="datetime"
                               value-format="yyyy-MM-dd HH:mm"
@@ -69,7 +69,7 @@
                               placeholder="开始时间">
               </el-date-picker>
               <span class="u-data-tag">至</span>
-              <el-date-picker v-model="formData.actEndTime"
+              <el-date-picker v-model.trim="formData.actEndTime"
                               class="list_item_width_3 u-data-tag"
                               type="datetime"
                               value-format="yyyy-MM-dd HH:mm"
@@ -84,7 +84,7 @@
                           label-width="150px">
               <el-input-number class="item_width_2"
                                :min="0"
-                               v-model="formData.actQuota"
+                               v-model.trim="formData.actQuota"
                                label="活动人数"></el-input-number>
             </el-form-item>
 
@@ -94,7 +94,7 @@
                           label-width="150px">
               <el-input-number class="item_width_2"
                                :min="0"
-                               v-model="formData.reward"
+                               v-model.trim="formData.reward"
                                label="活动积分"></el-input-number>
             </el-form-item>
             <el-form-item label="联系人"
@@ -104,7 +104,7 @@
               <el-input class="item_width_6"
                         maxlength="20"
                         placeholder="请输入联系人"
-                        v-model="formData.sponsorContacts">
+                        v-model.trim="formData.sponsorContacts">
               </el-input>
             </el-form-item>
           </div>
@@ -116,21 +116,21 @@
               <el-input class="item_width_6"
                         maxlength="20"
                         placeholder="请输入联系电话"
-                        v-model="formData.sponsorTel">
+                        v-model.trim="formData.sponsorTel">
               </el-input>
             </el-form-item>
             <el-form-item label="报名仅限志愿者"
                           prop="volunteerLimit"
                           label-width="150px"
                           style="display: block">
-              <el-checkbox v-model="formData.volunteerLimit"></el-checkbox>
+              <el-checkbox v-model.trim="formData.volunteerLimit"></el-checkbox>
             </el-form-item>
 
             <el-form-item label="报名无需审核"
                           prop="auditSwitch"
                           label-width="150px"
                           style="display: block">
-              <el-checkbox v-model="noauditSwitch"></el-checkbox>
+              <el-checkbox v-model.trim="noauditSwitch"></el-checkbox>
               <span class="div-tooltip">（选中后报名参加活动人员可以直接审核通过）</span>
             </el-form-item>
 
@@ -139,7 +139,7 @@
                           prop="signUpEndTime"
                           label-width="150px">
               <el-date-picker class="item_width_2"
-                              v-model="formData.signUpEndTime"
+                              v-model.trim="formData.signUpEndTime"
                               value-format="yyyy-MM-dd HH:mm"
                               format="yyyy-MM-dd HH:mm"
                               type="datetime"
@@ -157,13 +157,13 @@
                         show-word-limit
                         :rows="7"
                         placeholder="请输入报名条件，不超过200字"
-                        v-model="formData.requirement"></el-input>
+                        v-model.trim="formData.requirement"></el-input>
             </el-form-item>
 
             <el-form-item label="签到时间"
                           label-width="150px"
                           prop="signInStartTime">
-              <el-date-picker v-model="formData.signInStartTime"
+              <el-date-picker v-model.trim="formData.signInStartTime"
                               class="list_item_width_3"
                               type="datetime"
                               value-format="yyyy-MM-dd HH:mm"
@@ -171,7 +171,7 @@
                               placeholder="开始时间">
               </el-date-picker>
               <span class="u-data-tag">至</span>
-              <el-date-picker v-model="formData.signInEndTime"
+              <el-date-picker v-model.trim="formData.signInEndTime"
                               class="list_item_width_3 u-data-tag"
                               type="datetime"
                               value-format="yyyy-MM-dd HH:mm"
@@ -186,7 +186,7 @@
                           label-width="150px">
               <el-input-number class="item_width_2"
                                :min="0"
-                               v-model="formData.signInRadius"
+                               v-model.trim="formData.signInRadius"
                                label="签到有效范围"></el-input-number>
             </el-form-item>
           </div>
@@ -202,7 +202,7 @@
                           style="width: 330px"
                           show-word-limit
                           placeholder="请输入所在地址"
-                          v-model="formData.actAddress">
+                          v-model.trim="formData.actAddress">
                 </el-input>
                 <el-button style="margin-left: 10px"
                            type="default"
@@ -215,13 +215,13 @@
                   <el-input class="item_width_3"
                             maxlength="50"
                             placeholder="请输入经度"
-                            v-model="formData.actLatitude">
+                            v-model.trim="formData.actLatitude">
                   </el-input>
                   <span style="margin-left: 20px">纬度</span>
                   <el-input class="item_width_3"
                             maxlength="50"
                             placeholder="请输入纬度"
-                            v-model="formData.actLongitude">
+                            v-model.trim="formData.actLongitude">
                   </el-input>
                 </div> -->
               </div>
@@ -237,7 +237,7 @@
                           style="width: 330px"
                           show-word-limit
                           placeholder="请输入所在地址"
-                          v-model="formData.signInAddress">
+                          v-model.trim="formData.signInAddress">
                 </el-input>
                 <el-button style="margin-left: 10px"
                            type="default"
@@ -250,13 +250,13 @@
                   <el-input class="item_width_3"
                             maxlength="50"
                             placeholder="请输入经度"
-                            v-model="formData.signInLatitude">
+                            v-model.trim="formData.signInLatitude">
                   </el-input>
                   <span style="margin-left: 20px">纬度</span>
                   <el-input class="item_width_3"
                             maxlength="50"
                             placeholder="请输入纬度"
-                            v-model="formData.signInLongitude">
+                            v-model.trim="formData.signInLongitude">
                   </el-input>
                 </div> -->
               </div>
@@ -270,7 +270,7 @@
           <div v-if="formData.richTextFlag || formType === 'add'">
             <Tinymce class="tinymce_view"
                      v-if="formType != 'detail'"
-                     v-model="formData.actContentHtml"
+                     v-model.trim="formData.actContentHtml"
                      :height="250"
                      style="width: 1000px"
                      :customerId="customerId"
diff --git a/src/views/modules/communityParty/heart/heartList.vue b/src/views/modules/communityParty/heart/heartList.vue
index 560add256..7b0772cd8 100644
--- a/src/views/modules/communityParty/heart/heartList.vue
+++ b/src/views/modules/communityParty/heart/heartList.vue
@@ -8,7 +8,7 @@
 
         <el-form-item label="活动标题"
                       prop="title">
-          <el-input v-model="formData.title"
+          <el-input v-model.trim="formData.title"
                     size="small"
                     class="item_width_3"
                     clearable
@@ -19,7 +19,7 @@
 
         <el-form-item label="活动时间"
                       prop="actStartTime">
-          <el-date-picker v-model="formData.actStartTime"
+          <el-date-picker v-model.trim="formData.actStartTime"
                           :picker-options="startPickerOptions"
                           class="item_width_2"
                           size="small"
@@ -29,7 +29,7 @@
                           placeholder="开始时间">
           </el-date-picker>
           <span class="u-data-tag">至</span>
-          <el-date-picker v-model="formData.actEndTime"
+          <el-date-picker v-model.trim="formData.actEndTime"
                           :picker-options="endPickerOptions"
                           class="item_width_2 u-data-tag"
                           size="small"
@@ -43,7 +43,7 @@
         <el-form-item label="状态"
                       prop="status">
           <el-select class="item_width_3"
-                     v-model="formData.status"
+                     v-model.trim="formData.status"
                      size="small"
                      placeholder="请选择"
                      clearable>
@@ -265,7 +265,7 @@
                   show-word-limit
                   :rows="4"
                   placeholder="请输入取消理由"
-                  v-model="cancelReason"></el-input>
+                  v-model.trim="cancelReason"></el-input>
         <div style="display:flex;  justify-content: center;margin-top:20px">
           <el-button style="margin-left:30px"
                      size="small"
diff --git a/src/views/modules/communityParty/heart/heartReview.vue b/src/views/modules/communityParty/heart/heartReview.vue
index b6154e50c..00e275c5a 100644
--- a/src/views/modules/communityParty/heart/heartReview.vue
+++ b/src/views/modules/communityParty/heart/heartReview.vue
@@ -4,7 +4,7 @@
 
       <div class="div_tinymce">
         <Tinymce class="tinymce_view"
-                 v-model="actContent"
+                 v-model.trim="actContent"
                  :height="450"
                  style="width:1000px"
                  :customerId="customerId"
diff --git a/src/views/modules/communityParty/members/create.vue b/src/views/modules/communityParty/members/create.vue
index 36c88884a..2e2da4297 100644
--- a/src/views/modules/communityParty/members/create.vue
+++ b/src/views/modules/communityParty/members/create.vue
@@ -17,7 +17,7 @@
             <el-form-item prop="partyOrgId"
                           label="所属党组织">
               <el-cascader
-                  v-model="dataForm.partyOrgId"
+                  v-model.trim="dataForm.partyOrgId"
                   clearable
                   @change="handlePartyOrgCascadarChange"
                   :props="partyOrgTreeCascadarProps"
@@ -28,7 +28,7 @@
             <el-form-item prop="name"
                           label="党员姓名">
               <el-input
-                  v-model="dataForm.name"
+                  v-model.trim="dataForm.name"
                   
                   clearable
                   placeholder="请输入党员姓名"
@@ -42,7 +42,7 @@
           <el-form-item prop="mobile"
                         label="联系电话">
             <el-input
-                v-model="dataForm.mobile"
+                v-model.trim="dataForm.mobile"
                 clearable
                 placeholder="请输入联系电话"
             ></el-input>
@@ -52,7 +52,7 @@
           <el-form-item prop="idCard"
                         label="身份证号">
             <el-input
-                v-model="dataForm.idCard"
+                v-model.trim="dataForm.idCard"
                 
                 clearable
                 placeholder="请输入身份证号"
@@ -66,7 +66,7 @@
           <el-form-item prop="birthday"
                         label="出生日期">
             <el-date-picker
-                v-model="dataForm.birthday"
+                v-model.trim="dataForm.birthday"
                 value-format="yyyy-MM-dd"
                 style="width: 202px"
                 type="date"
@@ -78,7 +78,7 @@
           <!--1男 2女 0未知-->
           <el-form-item prop="gender"
                         label="性别">
-            <el-select v-model="dataForm.gender" placeholder="性别" >
+            <el-select v-model.trim="dataForm.gender" placeholder="性别" >
               <el-option
                   v-for="item in genderOptions"
                   :key="item.value"
@@ -94,7 +94,7 @@
         <el-col :span="12">
           <!--民族-->
           <el-form-item prop="nation" label="民族">
-            <el-select v-model="dataForm.nation" placeholder="请选择" >
+            <el-select v-model.trim="dataForm.nation" placeholder="请选择" >
               <el-option v-for="n in nationOptions"
                          :key="n.value"
                          :value="n.value"
@@ -106,7 +106,7 @@
         <el-col :span="12">
           <!--本地户籍-->
           <el-form-item prop="localResidenceFlag" label="本地户籍">
-            <el-select v-model="dataForm.localResidenceFlag" placeholder="请选择" >
+            <el-select v-model.trim="dataForm.localResidenceFlag" placeholder="请选择" >
               <el-option v-for="n in localResidenceFlagOptions"
                          :key="n.value"
                          :value="n.value"
@@ -121,7 +121,7 @@
         <el-col :span="24">
           <!--户籍地址-->
           <el-form-item prop="hjAddress" label="户籍地址" class="wd-wr">
-            <el-input v-model="dataForm.hjAddress" placeholder="请输入">
+            <el-input v-model.trim="dataForm.hjAddress" placeholder="请输入">
             </el-input>
           </el-form-item>
         </el-col>
@@ -130,7 +130,7 @@
         <el-col :span="24">
           <!--居住地址-->
           <el-form-item prop="jzAddress" label="居住地址" class="wd-wr">
-            <el-input v-model="dataForm.jzAddress"  placeholder="请输入">
+            <el-input v-model.trim="dataForm.jzAddress"  placeholder="请输入">
             </el-input>
           </el-form-item>
         </el-col>
@@ -140,7 +140,7 @@
         <el-col :span="12">
           <!--文化程度-->
           <el-form-item prop="cultureLevel" label="文化程度">
-            <el-select v-model="dataForm.cultureLevel" placeholder="请选择" >
+            <el-select v-model.trim="dataForm.cultureLevel" placeholder="请选择" >
               <el-option v-for="e in cultureLevelOptions"
                          :key="e.value"
                          :value="e.value"
@@ -152,7 +152,7 @@
         <el-col :span="12">
           <!--党组织职务-->
           <el-form-item prop="partyJob" label="党组织职务">
-            <el-select v-model="dataForm.partyJob" placeholder="请选择" >
+            <el-select v-model.trim="dataForm.partyJob" placeholder="请选择" >
               <el-option v-for="e in partyJobOptions"
                          :key="e.value"
                          :value="e.value"
@@ -166,7 +166,7 @@
         <el-col :span="24">
           <!--工作职责-->
           <el-form-item prop="duty" label="工作职责"  class="wd-wr">
-            <el-input v-model="dataForm.duty" placeholder="请输入">
+            <el-input v-model.trim="dataForm.duty" placeholder="请输入">
             </el-input>
           </el-form-item>
         </el-col>
@@ -178,7 +178,7 @@
           <!--入党日期-->
           <el-form-item prop="joinTime" label="入党日期" style="width: 100%">
             <el-date-picker
-                v-model="dataForm.joinTime"
+                v-model.trim="dataForm.joinTime"
                 style="width: 202px"
                 value-format="yyyy-MM-dd"
                 type="date"
@@ -191,7 +191,7 @@
           <!--positiveTime-->
           <el-form-item prop="positiveTime" label="转正日期" style="width: 100%">
             <el-date-picker
-                v-model="dataForm.positiveTime"
+                v-model.trim="dataForm.positiveTime"
                 value-format="yyyy-MM-dd"
                 style="width: 202px"
                 type="date"
@@ -204,7 +204,7 @@
       <el-row >
         <!--党员中心户-->
         <el-form-item prop="centerFlag" label="党员中心户" style="width: 100%">
-          <el-select v-model="dataForm.centerFlag" placeholder="请选择" >
+          <el-select v-model.trim="dataForm.centerFlag" placeholder="请选择" >
             <el-option v-for="e in centerFlagOptions"
                        :key="e.value"
                        :value="e.value"
@@ -217,7 +217,7 @@
         <el-col :span="12">
           <!--流动党员-->
           <el-form-item prop="flowFlag" label="流动党员">
-            <el-select v-model="dataForm.flowFlag" placeholder="请选择" >
+            <el-select v-model.trim="dataForm.flowFlag" placeholder="请选择" >
               <el-option v-for="e in flowFlagOptions"
                          :key="e.value"
                          :value="e.value"
@@ -229,7 +229,7 @@
         <el-col :span="12">
           <!--流动党员证号-->
           <el-form-item prop="flowActNum" label="流动党员证号" class="wd-wr">
-            <el-input v-model="dataForm.flowActNum" placeholder="请输入"></el-input>
+            <el-input v-model.trim="dataForm.flowActNum" placeholder="请输入"></el-input>
           </el-form-item>
         </el-col>
       </el-row>
@@ -238,7 +238,7 @@
         <el-col :span="12">
           <!--免学习-->
           <el-form-item prop="studyNotNeed" label="免学习">
-            <el-select v-model="dataForm.studyNotNeed" placeholder="请选择" >
+            <el-select v-model.trim="dataForm.studyNotNeed" placeholder="请选择" >
               <el-option v-for="e in studyNotNeedOptions"
                          :key="e.value"
                          :value="e.value"
@@ -250,7 +250,7 @@
         <el-col :span="12">
           <!--是否退休-->
           <el-form-item prop="retiredFlag" label="是否退休">
-            <el-select v-model="dataForm.retiredFlag" placeholder="请选择" >
+            <el-select v-model.trim="dataForm.retiredFlag" placeholder="请选择" >
               <el-option v-for="e in retiredFlagOptions"
                          :key="e.value"
                          :value="e.value"
@@ -264,7 +264,7 @@
         <el-col :span="12">
           <!--入党时所在党支部-->
           <el-form-item prop="joinBranchName" label="入党时所在党支部" class="wd-wr">
-            <el-input v-model="dataForm.joinBranchName" placeholder="请输入"></el-input>
+            <el-input v-model.trim="dataForm.joinBranchName" placeholder="请输入"></el-input>
           </el-form-item>
         </el-col>
 
@@ -272,7 +272,7 @@
           <!--组织关系转入社区时间-->
           <el-form-item prop="joinCommunityTime" label="组织关系转入社区时间" style="width: 100%">
             <el-date-picker
-                v-model="dataForm.joinCommunityTime"
+                v-model.trim="dataForm.joinCommunityTime"
                 value-format="yyyy-MM-dd"
                 style="width: 202px"
                 type="date"
@@ -286,7 +286,7 @@
         <el-col :span="24">
           <!--备注-->
           <el-form-item prop="remark" label="备注" class="wd-wr">
-            <el-input v-model="dataForm.remark" placeholder="请输入"></el-input>
+            <el-input v-model.trim="dataForm.remark" placeholder="请输入"></el-input>
           </el-form-item>
         </el-col>
       </el-row>
diff --git a/src/views/modules/communityParty/members/detail.vue b/src/views/modules/communityParty/members/detail.vue
index 1705090fc..2259b069c 100644
--- a/src/views/modules/communityParty/members/detail.vue
+++ b/src/views/modules/communityParty/members/detail.vue
@@ -16,7 +16,7 @@
             <el-form-item prop="partyOrgId"
                           label="所属党组织" class="wd-wr">
               <el-cascader
-                  v-model="dataForm.partyOrgId"
+                  v-model.trim="dataForm.partyOrgId"
                 style="width: 202px"
                   clearable
                   disabled
@@ -30,7 +30,7 @@
             <el-form-item prop="name"
                           label="党员姓名"  class="wd-wr">
               <el-input
-                  v-model="dataForm.name"
+                  v-model.trim="dataForm.name"
                   style="width: 202px"
                   clearable
                   disabled
@@ -45,7 +45,7 @@
           <el-form-item prop="mobile"
                         label="联系电话"  class="wd-wr">
             <el-input
-                v-model="dataForm.mobile"
+                v-model.trim="dataForm.mobile"
                 style="width: 202px"
                 clearable
                 disabled
@@ -57,7 +57,7 @@
           <el-form-item prop="idCard"
                         label="身份证号"  class="wd-wr">
             <el-input
-                v-model="dataForm.idCard"
+                v-model.trim="dataForm.idCard"
                 style="width: 202px"
                 clearable
                 disabled
@@ -72,7 +72,7 @@
           <el-form-item prop="birthday"
                         label="出生日期"  class="wd-wr">
             <el-date-picker
-                v-model="dataForm.birthday"
+                v-model.trim="dataForm.birthday"
                 value-format="yyyy-MM-dd"
                 style="width: 202px"
                 type="date"
@@ -85,7 +85,7 @@
           <!--1男 2女 0未知-->
           <el-form-item prop="gender"
                         label="性别"  class="wd-wr">
-            <el-select v-model="dataForm.gender" placeholder="性别"  disabled>
+            <el-select v-model.trim="dataForm.gender" placeholder="性别"  disabled>
               <el-option
                   v-for="item in genderOptions"
                   style="width: 202px"
@@ -102,7 +102,7 @@
         <el-col :span="12">
           <!--民族-->
           <el-form-item prop="nation" label="民族"  class="wd-wr">
-            <el-select v-model="dataForm.nation" placeholder="请选择"  disabled>
+            <el-select v-model.trim="dataForm.nation" placeholder="请选择"  disabled>
               <el-option v-for="n in nationOptions"
                          :key="n.value"
                          style="width: 202px"
@@ -116,7 +116,7 @@
           <!--本地户籍-->
           <el-form-item prop="localResidenceFlag" label="本地户籍"  class="wd-wr">
                          
-            <el-select v-model="dataForm.localResidenceFlag" placeholder="请选择" style="width: 202px"  disabled>
+            <el-select v-model.trim="dataForm.localResidenceFlag" placeholder="请选择" style="width: 202px"  disabled>
               <el-option v-for="n in localResidenceFlagOptions"
                          :key="n.value"
                          :value="n.value"
@@ -131,7 +131,7 @@
         <el-col :span="24">
           <!--户籍地址-->
           <el-form-item prop="hjAddress" label="户籍地址"  class="wd-wr">
-            <el-input v-model="dataForm.hjAddress" style="width: 100%" disabled>
+            <el-input v-model.trim="dataForm.hjAddress" style="width: 100%" disabled>
             </el-input>
           </el-form-item>
         </el-col>
@@ -140,7 +140,7 @@
         <el-col :span="24">
           <!--居住地址-->
           <el-form-item prop="jzAddress" label="居住地址" style="width: 100%"  class="wd-wr">
-            <el-input v-model="dataForm.jzAddress" disabled>
+            <el-input v-model.trim="dataForm.jzAddress" disabled>
             </el-input>
           </el-form-item>
         </el-col>
@@ -150,7 +150,7 @@
         <el-col :span="12">
           <!--文化程度-->
           <el-form-item prop="cultureLevel" label="文化程度"  class="wd-wr">
-            <el-select v-model="dataForm.cultureLevel" placeholder="请选择" style="width: 202px"  disabled>
+            <el-select v-model.trim="dataForm.cultureLevel" placeholder="请选择" style="width: 202px"  disabled>
               <el-option v-for="e in cultureLevelOptions"
                          :key="e.value"
                          :value="e.value"
@@ -162,7 +162,7 @@
         <el-col :span="12">
           <!--党组织职务-->
           <el-form-item prop="partyJob" label="党组织职务"  class="wd-wr">
-            <el-select v-model="dataForm.partyJob" placeholder="请选择" style="width: 202px"  disabled>
+            <el-select v-model.trim="dataForm.partyJob" placeholder="请选择" style="width: 202px"  disabled>
               <el-option v-for="e in partyJobOptions"
                          :key="e.value"
                          :value="e.value"
@@ -176,7 +176,7 @@
         <el-col :span="24">
           <!--工作职责-->
           <el-form-item prop="duty" label="工作职责"   class="wd-wr">
-            <el-input v-model="dataForm.duty" disabled>
+            <el-input v-model.trim="dataForm.duty" disabled>
             </el-input>
           </el-form-item>
         </el-col>
@@ -188,7 +188,7 @@
           <!--入党日期-->
           <el-form-item prop="joinTime" label="入党日期"   class="wd-wr">
             <el-date-picker
-                v-model="dataForm.joinTime"
+                v-model.trim="dataForm.joinTime"
                 style="width: 202px"
                 value-format="yyyy-MM-dd"
                 type="date"
@@ -202,7 +202,7 @@
           <!--positiveTime-->
           <el-form-item prop="positiveTime" label="转正日期" class="wd-wr">
             <el-date-picker
-                v-model="dataForm.positiveTime"
+                v-model.trim="dataForm.positiveTime"
                 value-format="yyyy-MM-dd"
                 style="width: 202px"
                 type="date"
@@ -217,7 +217,7 @@
         <!--党员中心户-->
         <el-col :span="24">
           <el-form-item prop="centerFlag" label="党员中心户" class="wd-wr">
-          <el-select v-model="dataForm.centerFlag" placeholder="请选择"  disabled>
+          <el-select v-model.trim="dataForm.centerFlag" placeholder="请选择"  disabled>
             <el-option v-for="e in centerFlagOptions"
                        :key="e.value"
                        :value="e.value"
@@ -231,7 +231,7 @@
         <el-col :span="12">
           <!--流动党员-->
           <el-form-item prop="flowFlag" label="流动党员"  class="wd-wr">
-            <el-select v-model="dataForm.flowFlag" placeholder="请选择"  disabled>
+            <el-select v-model.trim="dataForm.flowFlag" placeholder="请选择"  disabled>
               <el-option v-for="e in flowFlagOptions"
                          style="width: 202px"
                          :key="e.value"
@@ -245,7 +245,7 @@
           <!--流动党员证号-->
           <el-form-item prop="flowActNum" label="流动党员证号" class="wd-wr">
                
-            <el-input v-model="dataForm.flowActNum"  style="width: 202px" disabled></el-input>
+            <el-input v-model.trim="dataForm.flowActNum"  style="width: 202px" disabled></el-input>
           </el-form-item>
         </el-col>
       </el-row>
@@ -254,7 +254,7 @@
         <el-col :span="12">
           <!--免学习-->
           <el-form-item prop="studyNotNeed" label="免学习"  class="wd-wr">
-            <el-select v-model="dataForm.studyNotNeed" placeholder="请选择"  disabled>
+            <el-select v-model.trim="dataForm.studyNotNeed" placeholder="请选择"  disabled>
               <el-option v-for="e in studyNotNeedOptions"
                          style="width: 202px"
                          :key="e.value"
@@ -267,7 +267,7 @@
         <el-col :span="12">
           <!--是否退休-->
           <el-form-item prop="retiredFlag" label="是否退休"  class="wd-wr">
-            <el-select v-model="dataForm.retiredFlag" placeholder="请选择"  disabled>
+            <el-select v-model.trim="dataForm.retiredFlag" placeholder="请选择"  disabled>
               <el-option v-for="e in retiredFlagOptions"
                          style="width: 202px"
                          :key="e.value"
@@ -283,7 +283,7 @@
           <!--入党时所在党支部-->
           <el-form-item prop="joinBranchName" label="入党时所在党支部"  class="wd-wr">
                
-            <el-input v-model="dataForm.joinBranchName"  style="width: 202px" disabled></el-input>
+            <el-input v-model.trim="dataForm.joinBranchName"  style="width: 202px" disabled></el-input>
           </el-form-item>
         </el-col>
 
@@ -291,7 +291,7 @@
           <!--组织关系转入社区时间-->
           <el-form-item prop="joinCommunityTime" label="组织关系转入社区时间"  class="wd-wr">
             <el-date-picker
-                v-model="dataForm.joinCommunityTime"
+                v-model.trim="dataForm.joinCommunityTime"
                 value-format="yyyy-MM-dd"
                 style="width: 202px"
                 type="date"
@@ -306,7 +306,7 @@
         <el-col :span="24">
           <!--备注-->
           <el-form-item prop="remark" label="备注"  class="wd-wr">
-            <el-input v-model="dataForm.remark" disabled></el-input>
+            <el-input v-model.trim="dataForm.remark" disabled></el-input>
           </el-form-item>
         </el-col>
       </el-row>
diff --git a/src/views/modules/communityParty/members/memberList.vue b/src/views/modules/communityParty/members/memberList.vue
index d409365eb..9199d2304 100644
--- a/src/views/modules/communityParty/members/memberList.vue
+++ b/src/views/modules/communityParty/members/memberList.vue
@@ -8,29 +8,29 @@
                        size="small"
                        class="u-item-width-normal"
                        placeholder="请选择"
-                       v-model="searchForm.partyOrgId"
+                       v-model.trim="searchForm.partyOrgId"
                        @change="handlePartyOrgCascadarChange"
                        :props="partyOrgTreeCascadarProps">
           </el-cascader>
         </el-form-item>
         <el-form-item label="党员姓名" >
-          <el-input v-model="searchForm.name" placeholder="请输入"  size="small"
+          <el-input v-model.trim="searchForm.name" placeholder="请输入"  size="small"
                        class="u-item-width-normal" clearable></el-input>
         </el-form-item>
         <el-form-item label="联系电话" >
-          <el-input v-model="searchForm.mobile" placeholder="请输入"  size="small"
+          <el-input v-model.trim="searchForm.mobile" placeholder="请输入"  size="small"
                        class="u-item-width-normal" clearable></el-input>
         </el-form-item>
         <el-form-item label="身份证号">
-          <el-input v-model="searchForm.idCard" placeholder="请输入"  size="small"
+          <el-input v-model.trim="searchForm.idCard" placeholder="请输入"  size="small"
                        class="u-item-width-normal" clearable></el-input>
         </el-form-item>
         <el-form-item label="居住地址">
-          <el-input v-model="searchForm.jzAddress" placeholder="请输入"  size="small"
+          <el-input v-model.trim="searchForm.jzAddress" placeholder="请输入"  size="small"
                        class="u-item-width-normal" clearable></el-input>
         </el-form-item>
         <el-form-item label="职务">
-          <el-select v-model="searchForm.partyJob" placeholder="请选择" clearable  size="small"
+          <el-select v-model.trim="searchForm.partyJob" placeholder="请选择" clearable  size="small"
                        class="u-item-width-normal">
             <el-option v-for="e in partyJobOptions"
                        :key="e.value"
@@ -39,7 +39,7 @@
           </el-select>
         </el-form-item>
         <el-form-item label="入党日期">
-          <el-date-picker v-model="searchForm.joinTimeStart"
+          <el-date-picker v-model.trim="searchForm.joinTimeStart"
                               :picker-options="startPickerOptions"
                               class="u-item-width-daterange"
                               size="small"
@@ -49,7 +49,7 @@
                               placeholder="开始时间">
               </el-date-picker>
               <span class="u-data-tag">至</span>
-              <el-date-picker v-model="searchForm.joinTimeEnd"
+              <el-date-picker v-model.trim="searchForm.joinTimeEnd"
                               :picker-options="endPickerOptions"
                               class="u-item-width-daterange u-data-tag"
                               size="small"
@@ -62,7 +62,7 @@
 
         <!--党员中心户-->
         <el-form-item prop="centerFlag" label="党员中心户" >
-          <el-select v-model="searchForm.centerFlag" placeholder="请选择" clearable  size="small"
+          <el-select v-model.trim="searchForm.centerFlag" placeholder="请选择" clearable  size="small"
                        class="u-item-width-normal">
             <el-option v-for="e in centerFlagOptions"
                        :key="e.value"
@@ -73,7 +73,7 @@
 
         <!--流动党员-->
         <el-form-item prop="flowFlag" label="流动党员"  >
-          <el-select v-model="searchForm.flowFlag" placeholder="请选择" clearable size="small"
+          <el-select v-model.trim="searchForm.flowFlag" placeholder="请选择" clearable size="small"
                        class="u-item-width-normal">
             <el-option v-for="e in flowFlagOptions"
                        :key="e.value"
@@ -84,13 +84,13 @@
 
         <!--流动党员证号-->
         <el-form-item prop="flowActNum" label="流动党员证号"  >
-          <el-input v-model="searchForm.flowActNum" clearable size="small"
+          <el-input v-model.trim="searchForm.flowActNum" clearable size="small"
                        class="u-item-width-normal" placeholder="请输入"></el-input>
         </el-form-item>
 
         <!--免学习-->
         <el-form-item prop="studyNotNeed" label="免学习">
-          <el-select v-model="searchForm.studyNotNeed" placeholder="请选择" clearable  size="small"
+          <el-select v-model.trim="searchForm.studyNotNeed" placeholder="请选择" clearable  size="small"
                        class="u-item-width-normal">
             <el-option v-for="e in studyNotNeedOptions"
                        :key="e.value"
@@ -99,7 +99,7 @@
           </el-select>
         </el-form-item>
         <el-form-item prop="studyNotNeed" label="是否缴费">
-          <el-select v-model="searchForm.payFlag" placeholder="请选择" clearable  size="small"
+          <el-select v-model.trim="searchForm.payFlag" placeholder="请选择" clearable  size="small"
                        class="u-item-width-normal">
             <el-option v-for="e in studyNotNeedOptions"
                        :key="e.value"
@@ -108,7 +108,7 @@
           </el-select>
         </el-form-item>
         <el-form-item label="最近缴费日期">
-          <el-date-picker v-model="searchForm.payTimeStart"
+          <el-date-picker v-model.trim="searchForm.payTimeStart"
                               :picker-options="startPickerOptions"
                               class="u-item-width-daterange"
                               size="small"
@@ -118,7 +118,7 @@
                               placeholder="开始时间">
               </el-date-picker>
               <span class="u-data-tag">至</span>
-              <el-date-picker v-model="searchForm.payTimeEnd"
+              <el-date-picker v-model.trim="searchForm.payTimeEnd"
                               :picker-options="endPickerOptions"
                               class="u-item-width-daterange u-data-tag"
                               size="small"
diff --git a/src/views/modules/communityParty/members/payRecord.vue b/src/views/modules/communityParty/members/payRecord.vue
index 47d572ddb..c7eff6460 100644
--- a/src/views/modules/communityParty/members/payRecord.vue
+++ b/src/views/modules/communityParty/members/payRecord.vue
@@ -4,24 +4,24 @@
       <el-row>
         <el-col :span="12">
           <el-form-item label="所属党组织">
-            <el-input disabled v-model="partyOrgName" style="width: 240px"></el-input>
+            <el-input disabled v-model.trim="partyOrgName" style="width: 240px"></el-input>
           </el-form-item>
         </el-col>
         <el-col :span="12">
           <el-form-item label="党员姓名">
-            <el-input disabled v-model="partyMemberName" style="width: 240px"></el-input>
+            <el-input disabled v-model.trim="partyMemberName" style="width: 240px"></el-input>
           </el-form-item>
         </el-col>
       </el-row>
       <el-row>
         <el-col :span="12">
           <el-form-item label="联系电话">
-            <el-input disabled v-model="mobile" style="width: 240px"></el-input>
+            <el-input disabled v-model.trim="mobile" style="width: 240px"></el-input>
           </el-form-item>
         </el-col>
         <el-col :span="12">
           <el-form-item label="证件号">
-            <el-input disabled v-model="idCard" style="width: 240px"></el-input>
+            <el-input disabled v-model.trim="idCard" style="width: 240px"></el-input>
           </el-form-item>
         </el-col>
       </el-row>
@@ -51,7 +51,7 @@
                          width="250px">
           <template slot-scope="scope">
             <el-date-picker v-if="scope.row.isEdit"
-                            v-model="scope.row.payDate"
+                            v-model.trim="scope.row.payDate"
                             type="date"
                             value-format="yyyy-MM-dd"
                             placeholder="选择日期">
@@ -68,7 +68,7 @@
           <template slot-scope="scope">
             <el-input v-if="scope.row.isEdit"
                       type="number"
-                      v-model="scope.row.money"
+                      v-model.trim="scope.row.money"
                       placeholder="请输入"
                       class="input-width"
                       clearable></el-input>
@@ -83,7 +83,7 @@
                          min-width="250px">
           <template slot-scope="scope">
             <el-date-picker v-if="scope.row.isEdit"
-                            v-model="scope.row.timeRange"
+                            v-model.trim="scope.row.timeRange"
                             type="monthrange"
                             value-format="yyyy-MM"
                             range-separator="至"
diff --git a/src/views/modules/communityParty/members/points.vue b/src/views/modules/communityParty/members/points.vue
index ebde56a6c..4117fa9b7 100644
--- a/src/views/modules/communityParty/members/points.vue
+++ b/src/views/modules/communityParty/members/points.vue
@@ -9,24 +9,24 @@
       <el-row>
         <el-col :span="12">
           <el-form-item label="所属党组织">
-            <el-input disabled v-model="partyOrgName" style="width: 240px"></el-input>
+            <el-input disabled v-model.trim="partyOrgName" style="width: 240px"></el-input>
           </el-form-item>
         </el-col>
         <el-col :span="12">
           <el-form-item label="党员姓名">
-            <el-input disabled v-model="partyMemberName" style="width: 240px"></el-input>
+            <el-input disabled v-model.trim="partyMemberName" style="width: 240px"></el-input>
           </el-form-item>
         </el-col>
       </el-row>
       <el-row>
         <el-col :span="12">
           <el-form-item label="联系电话">
-            <el-input disabled v-model="mobile" style="width: 240px"></el-input>
+            <el-input disabled v-model.trim="mobile" style="width: 240px"></el-input>
           </el-form-item>
         </el-col>
         <el-col :span="12">
           <el-form-item label="证件号">
-            <el-input disabled v-model="idCard" style="width: 240px"></el-input>
+            <el-input disabled v-model.trim="idCard" style="width: 240px"></el-input>
           </el-form-item>
         </el-col>
       </el-row>
@@ -41,7 +41,7 @@
             <!-- <div class="mr10">评分周期</div> -->
             <div class="mr10">
               <el-date-picker
-                  v-model="form.year"
+                  v-model.trim="form.year"
                   type="year"
                   value-format="yyyy"
                   placeholder="选择年"
@@ -50,7 +50,7 @@
             </div>
             <div class="mr10">
               <el-form-item prop="quarter">
-                <el-select v-model="form.quarter" placeholder="请选择" class="input-width" clearable
+                <el-select v-model.trim="form.quarter" placeholder="请选择" class="input-width" clearable
                            @change="handleQuaterChange">
                   <el-option
                       v-for="item in quarterList"
@@ -65,10 +65,10 @@
         </el-form-item>
       </div>
       <el-form-item label="基础积分分值" prop="basePoint">
-        <el-input v-model="form.basePoint" type="number" placeholder="请输入" class="input-width" clearable/>
+        <el-input v-model.trim="form.basePoint" type="number" placeholder="请输入" class="input-width" clearable/>
       </el-form-item>
       <el-form-item label="基础积分选项" prop="baseOptions" class="wd-wr" :style="'width:' + formItemWd">
-        <el-checkbox-group v-model="form.baseOptions">
+        <el-checkbox-group v-model.trim="form.baseOptions">
           <el-checkbox v-for="item in baseOptions" :key="item.value" :label="item.value">
             {{ item.label }}
           </el-checkbox>
@@ -76,11 +76,11 @@
       </el-form-item>
       <div>
         <el-form-item label="民主评议积分分值" prop="reviewPoint">
-          <el-input v-model="form.reviewPoint" type="number" placeholder="请输入" class="input-width"
+          <el-input v-model.trim="form.reviewPoint" type="number" placeholder="请输入" class="input-width"
                     clearable></el-input>
         </el-form-item>
         <el-form-item label="民主评议积分选项" prop="reviewOptions" class="wd-wr" :style="'width:' + formItemWd">
-          <el-checkbox-group v-model="form.reviewOptions">
+          <el-checkbox-group v-model.trim="form.reviewOptions">
             <el-checkbox v-for="item in pyiOptions" :key="item.value" :label="item.value">
               {{ item.label }}
             </el-checkbox>
@@ -89,10 +89,10 @@
       </div>
       <div>
         <el-form-item label="激励积分分值" prop="inspirePoint">
-          <el-input v-model="form.inspirePoint" type="number" placeholder="请输入" class="input-width" clearable/>
+          <el-input v-model.trim="form.inspirePoint" type="number" placeholder="请输入" class="input-width" clearable/>
         </el-form-item>
         <el-form-item label="激励积分选项" prop="inspireOptions" class="wd-wr" :style="'width:' + formItemWd">
-          <el-checkbox-group v-model="form.inspireOptions">
+          <el-checkbox-group v-model.trim="form.inspireOptions">
             <el-checkbox v-for="item in jiliOptions" :key="item.value" :label="item.value">
               {{ item.label }}
             </el-checkbox>
@@ -101,10 +101,10 @@
       </div>
       <div>
         <el-form-item label="警示扣分分值" prop="warnPoint">
-          <el-input v-model="form.warnPoint" type="number" placeholder="请输入" class="input-width" clearable/>
+          <el-input v-model.trim="form.warnPoint" type="number" placeholder="请输入" class="input-width" clearable/>
         </el-form-item>
         <el-form-item label="警示扣分选项" prop="warnOptions" class="wd-wr" :style="'width:' + formItemWd">
-          <el-checkbox-group v-model="form.warnOptions">
+          <el-checkbox-group v-model.trim="form.warnOptions">
             <el-checkbox v-for="item in jinshiOptions" :key="item.value" :label="item.value">
               {{ item.label }}
             </el-checkbox>
diff --git a/src/views/modules/communityParty/members/update.vue b/src/views/modules/communityParty/members/update.vue
index d6f16421f..637876a40 100644
--- a/src/views/modules/communityParty/members/update.vue
+++ b/src/views/modules/communityParty/members/update.vue
@@ -8,14 +8,14 @@
         <el-col :span="12">
           <el-form-item prop="partyOrgId" label="所属党组织" class="wd-wr">
             <el-cascader    
- v-model="dataForm.partyOrgId" clearable
+ v-model.trim="dataForm.partyOrgId" clearable
               @change="handlePartyOrgCascadarChange" :props="partyOrgTreeCascadarProps"
               :options="partyOrgTree"></el-cascader>
           </el-form-item>
         </el-col>
         <el-col :span="12">
           <el-form-item prop="name" label="党员姓名" class="wd-wr">
-            <el-input v-model="dataForm.name"    
+            <el-input v-model.trim="dataForm.name"    
  clearable placeholder="请输入党员姓名"></el-input>
           </el-form-item>
         </el-col>
@@ -23,12 +23,12 @@
       <el-row >
         <el-col :span="12">
           <el-form-item prop="mobile" label="联系电话" class="wd-wr">
-            <el-input v-model="dataForm.mobile" style="width: 202px" clearable placeholder="请输入联系电话"></el-input>
+            <el-input v-model.trim="dataForm.mobile" style="width: 202px" clearable placeholder="请输入联系电话"></el-input>
           </el-form-item>
         </el-col>
         <el-col :span="12">
           <el-form-item prop="idCard" label="身份证号" class="wd-wr">
-            <el-input v-model="dataForm.idCard" style="width: 202px" clearable placeholder="请输入身份证号"></el-input>
+            <el-input v-model.trim="dataForm.idCard" style="width: 202px" clearable placeholder="请输入身份证号"></el-input>
           </el-form-item>
         </el-col>
       </el-row>
@@ -36,7 +36,7 @@
       <el-row >
         <el-col :span="12">
           <el-form-item prop="birthday" label="出生日期" class="wd-wr">
-            <el-date-picker v-model="dataForm.birthday" value-format="yyyy-MM-dd" style="width: 202px" type="date"
+            <el-date-picker v-model.trim="dataForm.birthday" value-format="yyyy-MM-dd" style="width: 202px" type="date"
               placeholder="选择日期">
             </el-date-picker>
           </el-form-item>
@@ -44,7 +44,7 @@
         <el-col :span="12">
           <!--1男 2女 0未知-->
           <el-form-item prop="gender" label="性别" class="wd-wr">
-            <el-select v-model="dataForm.gender" placeholder="性别" style="width: 202px">
+            <el-select v-model.trim="dataForm.gender" placeholder="性别" style="width: 202px">
               <el-option v-for="item in genderOptions" :key="item.value" :label="item.label" :value="item.value">
               </el-option>
             </el-select>
@@ -56,7 +56,7 @@
         <el-col :span="12">
           <!--民族-->
           <el-form-item prop="nation" label="民族" class="wd-wr">
-            <el-select v-model="dataForm.nation" placeholder="请选择" style="width: 202px">
+            <el-select v-model.trim="dataForm.nation" placeholder="请选择" style="width: 202px">
               <el-option v-for="n in nationOptions" :key="n.value" :value="n.value" :label="n.label">
               </el-option>
             </el-select>
@@ -65,7 +65,7 @@
         <el-col :span="12">
           <!--本地户籍-->
           <el-form-item prop="localResidenceFlag" label="本地户籍" class="wd-wr">
-            <el-select v-model="dataForm.localResidenceFlag" placeholder="请选择" style="width: 202px">
+            <el-select v-model.trim="dataForm.localResidenceFlag" placeholder="请选择" style="width: 202px">
               <el-option v-for="n in localResidenceFlagOptions" :key="n.value" :value="n.value" :label="n.label">
               </el-option>
             </el-select>
@@ -77,7 +77,7 @@
         <el-col :span="24">
           <!--户籍地址-->
           <el-form-item prop="hjAddress" label="户籍地址" class="wd-wr">
-            <el-input v-model="dataForm.hjAddress" style="width: 100%" placeholder="请输入">
+            <el-input v-model.trim="dataForm.hjAddress" style="width: 100%" placeholder="请输入">
             </el-input>
           </el-form-item>
         </el-col>
@@ -86,7 +86,7 @@
         <el-col :span="24">
           <!--居住地址-->
           <el-form-item prop="jzAddress" label="居住地址" class="wd-wr">
-            <el-input v-model="dataForm.jzAddress" placeholder="请输入">
+            <el-input v-model.trim="dataForm.jzAddress" placeholder="请输入">
             </el-input>
           </el-form-item>
         </el-col>
@@ -96,7 +96,7 @@
         <el-col :span="12">
           <!--文化程度-->
           <el-form-item prop="cultureLevel" label="文化程度" class="wd-wr">
-            <el-select v-model="dataForm.cultureLevel" placeholder="请选择" style="width: 202px">
+            <el-select v-model.trim="dataForm.cultureLevel" placeholder="请选择" style="width: 202px">
               <el-option v-for="e in cultureLevelOptions" :key="e.value" :value="e.value" :label="e.label"></el-option>
             </el-select>
           </el-form-item>
@@ -105,7 +105,7 @@
         <el-col :span="12">
           <!--党组织职务-->
           <el-form-item prop="partyJob" label="党组织职务" class="wd-wr">
-            <el-select v-model="dataForm.partyJob" placeholder="请选择" style="width: 202px">
+            <el-select v-model.trim="dataForm.partyJob" placeholder="请选择" style="width: 202px">
               <el-option v-for="e in partyJobOptions" :key="e.value" :value="e.value" :label="e.label"></el-option>
             </el-select>
           </el-form-item>
@@ -116,7 +116,7 @@
         <el-col :span="24">
           <!--工作职责-->
           <el-form-item prop="duty" label="工作职责" class="wd-wr">
-            <el-input v-model="dataForm.duty" placeholder="请输入">
+            <el-input v-model.trim="dataForm.duty" placeholder="请输入">
             </el-input>
           </el-form-item>
         </el-col>
@@ -127,7 +127,7 @@
         <el-col :span="12">
           <!--入党日期-->
           <el-form-item prop="joinTime" label="入党日期" class="wd-wr">
-            <el-date-picker v-model="dataForm.joinTime" style="width: 202px" value-format="yyyy-MM-dd" type="date"
+            <el-date-picker v-model.trim="dataForm.joinTime" style="width: 202px" value-format="yyyy-MM-dd" type="date"
               placeholder="选择日期">
             </el-date-picker>
           </el-form-item>
@@ -136,7 +136,7 @@
         <el-col :span="12">
           <!--positiveTime-->
           <el-form-item prop="positiveTime" label="转正日期" class="wd-wr">
-            <el-date-picker v-model="dataForm.positiveTime" value-format="yyyy-MM-dd" style="width: 202px" type="date"
+            <el-date-picker v-model.trim="dataForm.positiveTime" value-format="yyyy-MM-dd" style="width: 202px" type="date"
               placeholder="选择日期">
             </el-date-picker>
           </el-form-item>
@@ -146,7 +146,7 @@
       <el-row >
         <!--党员中心户-->
         <el-form-item prop="centerFlag" label="党员中心户" class="wd-wr">
-          <el-select v-model="dataForm.centerFlag" placeholder="请选择" style="width: 202px">
+          <el-select v-model.trim="dataForm.centerFlag" placeholder="请选择" style="width: 202px">
             <el-option v-for="e in centerFlagOptions" :key="e.value" :value="e.value" :label="e.label"></el-option>
           </el-select>
         </el-form-item>
@@ -156,7 +156,7 @@
         <el-col :span="12">
           <!--流动党员-->
           <el-form-item prop="flowFlag" label="流动党员" class="wd-wr">
-            <el-select v-model="dataForm.flowFlag" placeholder="请选择" style="width: 202px">
+            <el-select v-model.trim="dataForm.flowFlag" placeholder="请选择" style="width: 202px">
               <el-option v-for="e in flowFlagOptions" :key="e.value" :value="e.value" :label="e.label"></el-option>
             </el-select>
           </el-form-item>
@@ -165,7 +165,7 @@
         <el-col :span="12">
           <!--流动党员证号-->
           <el-form-item prop="flowActNum" label="流动党员证号" class="wd-wr">
-            <el-input v-model="dataForm.flowActNum" style="width: 202px;" placeholder="请输入"></el-input>
+            <el-input v-model.trim="dataForm.flowActNum" style="width: 202px;" placeholder="请输入"></el-input>
           </el-form-item>
         </el-col>
       </el-row>
@@ -174,7 +174,7 @@
         <el-col :span="12">
           <!--免学习-->
           <el-form-item prop="studyNotNeed" label="免学习" class="wd-wr">
-            <el-select v-model="dataForm.studyNotNeed" placeholder="请选择" style="width: 202px">
+            <el-select v-model.trim="dataForm.studyNotNeed" placeholder="请选择" style="width: 202px">
               <el-option v-for="e in studyNotNeedOptions" :key="e.value" :value="e.value" :label="e.label"></el-option>
             </el-select>
           </el-form-item>
@@ -183,7 +183,7 @@
         <el-col :span="12">
           <!--是否退休-->
           <el-form-item prop="retiredFlag" label="是否退休" class="wd-wr">
-            <el-select v-model="dataForm.retiredFlag" placeholder="请选择" style="width: 202px">
+            <el-select v-model.trim="dataForm.retiredFlag" placeholder="请选择" style="width: 202px">
               <el-option v-for="e in retiredFlagOptions" :key="e.value" :value="e.value" :label="e.label"></el-option>
             </el-select>
           </el-form-item>
@@ -194,14 +194,14 @@
         <el-col :span="12">
           <!--入党时所在党支部-->
           <el-form-item prop="joinBranchName" label="入党时所在党支部" class="wd-wr">
-            <el-input v-model="dataForm.joinBranchName" placeholder="请选择"></el-input>
+            <el-input v-model.trim="dataForm.joinBranchName" placeholder="请选择"></el-input>
           </el-form-item>
         </el-col>
 
         <el-col :span="12">
           <!--组织关系转入社区时间-->
           <el-form-item prop="joinCommunityTime" label="组织关系转入社区时间" class="wd-wr">
-            <el-date-picker v-model="dataForm.joinCommunityTime" value-format="yyyy-MM-dd" style="width: 202px"
+            <el-date-picker v-model.trim="dataForm.joinCommunityTime" value-format="yyyy-MM-dd" style="width: 202px"
               type="date" placeholder="选择日期">
             </el-date-picker>
           </el-form-item>
@@ -212,7 +212,7 @@
         <el-col :span="24">
           <!--备注-->
           <el-form-item prop="remark" label="备注" class="wd-wr">
-            <el-input v-model="dataForm.remark" placeholder="请选择"></el-input>
+            <el-input v-model.trim="dataForm.remark" placeholder="请选择"></el-input>
           </el-form-item>
         </el-col>
       </el-row>
@@ -328,12 +328,10 @@ export default {
      */
     async handleNextOrgTreeClick(node, resolve) {
 
-      // if (node.level === 1) {
-      //   // loadPartyOrgTreeRoot接口已经返回了1，2级，所以点击1级的时候不需要加载了
-      //   resolve(null)
-      //   return
-      // }
-
+      if(node.children.length>0){
+          resolve(null)
+          return
+      }
       let url = '/actual/base/party/org/listNextLevelPartyOrgTreeNodesByPid'
 
       let rst = await requestGet(url, {
diff --git a/src/views/modules/communityParty/orgActivity/activivityList/activivityList.vue b/src/views/modules/communityParty/orgActivity/activivityList/activivityList.vue
index 1524f5c9b..3d7750030 100644
--- a/src/views/modules/communityParty/orgActivity/activivityList/activivityList.vue
+++ b/src/views/modules/communityParty/orgActivity/activivityList/activivityList.vue
@@ -13,7 +13,7 @@
               <el-cascader class="customer_cascader"
                            ref="myCascader"
                            size="small"
-                           v-model="agencyIdArray"
+                           v-model.trim="agencyIdArray"
                            :options="orgOptions"
                            :props="orgOptionProps"
                            :show-all-levels="false"
@@ -21,7 +21,7 @@
             </el-form-item>
             <el-form-item label="活动类型"
                           prop="actType">
-              <el-select v-model="formData.actType"
+              <el-select v-model.trim="formData.actType"
                          placeholder="请选择"
                          size="small"
                          clearable
@@ -35,7 +35,7 @@
             </el-form-item>
             <el-form-item label="举办时间"
                           prop="startDate">
-              <el-date-picker v-model="formData.startDate"
+              <el-date-picker v-model.trim="formData.startDate"
                               class="item_width_2"
                               size="small"
                               type="date"
@@ -44,7 +44,7 @@
                               placeholder="开始时间">
               </el-date-picker>
               <span class="u-data-tag">至</span>
-              <el-date-picker v-model="formData.endDate"
+              <el-date-picker v-model.trim="formData.endDate"
                               :picker-options="endPickerOptions"
                               class="item_width_2 u-data-tag"
                               size="small"
@@ -56,7 +56,7 @@
             </el-form-item>
             <el-form-item label="活动地点"
                           prop="address">
-              <el-input v-model="formData.address"
+              <el-input v-model.trim="formData.address"
                         class="item_width_2"
                         size="small"
                         clearable
@@ -66,7 +66,7 @@
 
             <el-form-item label="活动主题"
                           prop="topic">
-              <el-input v-model="formData.topic"
+              <el-input v-model.trim="formData.topic"
                         class="item_width_2"
                         size="small"
                         clearable
@@ -77,7 +77,7 @@
             <el-form-item label="发布状态"
                           prop="isPublish">
               <el-select class="item_width_2"
-                         v-model="formData.isPublish"
+                         v-model.trim="formData.isPublish"
                          placeholder="全部"
                          size="small"
                          clearable>
diff --git a/src/views/modules/communityParty/orgActivity/activivityList/addActivity.vue b/src/views/modules/communityParty/orgActivity/activivityList/addActivity.vue
index 3c122790b..d5f3fb60f 100644
--- a/src/views/modules/communityParty/orgActivity/activivityList/addActivity.vue
+++ b/src/views/modules/communityParty/orgActivity/activivityList/addActivity.vue
@@ -12,7 +12,7 @@
         <el-form-item label="活动类型"
                       label-width="150px"
                       prop="actType">
-          <el-select v-model="formData.actType"
+          <el-select v-model.trim="formData.actType"
                      placeholder="请选择"
                      clearable
                      class="item_width_1">
@@ -28,7 +28,7 @@
                       style="display: block"
                       prop="holdTime"
                       label-width="150px">
-          <el-date-picker v-model="formData.holdTime"
+          <el-date-picker v-model.trim="formData.holdTime"
                           value-format="yyyy-MM-dd HH:mm:ss"
                           format="yyyy-MM-dd HH:mm:ss"
                           type="datetime"
@@ -42,7 +42,7 @@
                       style="display: block">
           <el-input class="item_width_1"
                     placeholder="请输入活动主题"
-                    v-model="formData.topic">
+                    v-model.trim="formData.topic">
           </el-input>
         </el-form-item>
         <el-form-item label="活动地点"
@@ -51,7 +51,7 @@
                       style="display: block">
           <el-input class="item_width_1"
                     placeholder="请输入活动地点"
-                    v-model="formData.address">
+                    v-model.trim="formData.address">
           </el-input>
         </el-form-item>
 
@@ -60,7 +60,7 @@
                       label-width="150px"
                       style="display: block">
           <el-select class="item_width_1"
-                     v-model="formData.autoPublicType"
+                     v-model.trim="formData.autoPublicType"
                      placeholder="请选择"
                      filterable
                      clearable>
@@ -82,7 +82,7 @@
           <el-cascader v-else
                        class="item_width_1"
                        ref="myCascader"
-                       v-model="formData.publichIdArray"
+                       v-model.trim="formData.publichIdArray"
                        :key="iscascaderShow"
                        :options="publishOptions"
                        :props="publichOptionProps"
@@ -98,7 +98,7 @@
           <el-cascader v-else
                        class="item_width_1"
                        ref="myCascader_join"
-                       v-model="formData.joinIdArray"
+                       v-model.trim="formData.joinIdArray"
                        :key="joinIscascaderShow"
                        :options="joinOptions"
                        :props="joinOptionProps"
@@ -111,7 +111,7 @@
                       label-width="150px"
                       style="display: block">
           <el-select class="item_width_1"
-                     v-model="formData.joinUserType"
+                     v-model.trim="formData.joinUserType"
                      placeholder="请选择"
                      filterable
                      clearable>
@@ -129,7 +129,7 @@
                       label-width="150px"
                       style="display: block">
           <el-checkbox :label="'是'"
-                       v-model="isAutoInform"></el-checkbox>
+                       v-model.trim="isAutoInform"></el-checkbox>
         </el-form-item>
 
         <el-form-item label="活动介绍"
@@ -142,7 +142,7 @@
                     show-word-limit
                     :rows="3"
                     placeholder="请输入活动介绍，不超过1000字"
-                    v-model="formData.introduce"></el-input>
+                    v-model.trim="formData.introduce"></el-input>
         </el-form-item>
 
         <el-form-item class="block"
diff --git a/src/views/modules/communityParty/orgActivity/activivityList/addRule.vue b/src/views/modules/communityParty/orgActivity/activivityList/addRule.vue
index 01059e9e3..7132df5ec 100644
--- a/src/views/modules/communityParty/orgActivity/activivityList/addRule.vue
+++ b/src/views/modules/communityParty/orgActivity/activivityList/addRule.vue
@@ -7,7 +7,7 @@
 
           <el-select style="margin-left:30px"
                      class="item_width_1"
-                     v-model="actType"
+                     v-model.trim="actType"
                      placeholder="全部"
                      size="small"
                      clearable>
@@ -54,7 +54,7 @@
                            width="200">
             <template slot-scope="scope">
 
-              <el-date-picker v-model="scope.row.holdTime"
+              <el-date-picker v-model.trim="scope.row.holdTime"
                               style="width: 175px"
                               size="small"
                               format="yyyy-MM-dd hh:mm:ss"
@@ -76,7 +76,7 @@
                            width="220">
             <template slot-scope="scope">
 
-              <el-input v-model="scope.row.address"
+              <el-input v-model.trim="scope.row.address"
                         style="width: 195px"
                         size="small"
                         placeholder="输入地点">
@@ -92,7 +92,7 @@
                            min-width="220">
             <template slot-scope="scope">
 
-              <el-input v-model="scope.row.topic"
+              <el-input v-model.trim="scope.row.topic"
                         style="width: 195px"
                         size="small"
                         placeholder="输入主题">
@@ -112,7 +112,7 @@
 
               <el-cascader class="item_width_1"
                            :ref="'myCascader'+scope.$index"
-                           v-model="scope.row.publichIdArray"
+                           v-model.trim="scope.row.publichIdArray"
                            :key="iscascaderShow"
                            :options="publishOptions"
                            :props="publichOptionProps"
@@ -131,7 +131,7 @@
 
               <el-cascader class="item_width_1"
                            :ref="'myCascader_join'+scope.$index"
-                           v-model="scope.row.joinIdArray"
+                           v-model.trim="scope.row.joinIdArray"
                            :key="joinIscascaderShow"
                            :options="joinOptions"
                            :props="joinOptionProps"
@@ -151,7 +151,7 @@
 
               <el-select style="width: 115px"
                          size="small"
-                         v-model="scope.row.joinUserType"
+                         v-model.trim="scope.row.joinUserType"
                          placeholder="请选择"
                          clearable>
                 <el-option v-for="item in joinArray"
@@ -172,7 +172,7 @@
             <template slot-scope="scope">
 
               <el-select style="width: 135px"
-                         v-model="scope.row.autoPublicType"
+                         v-model.trim="scope.row.autoPublicType"
                          size="small"
                          placeholder="请选择"
                          filterable
@@ -197,7 +197,7 @@
 
               <el-checkbox :label="'是'"
                            size="small"
-                           v-model="scope.row.isAutoInformShow"></el-checkbox>
+                           v-model.trim="scope.row.isAutoInformShow"></el-checkbox>
 
             </template>
           </el-table-column>
diff --git a/src/views/modules/communityParty/orgActivity/activivityList/scheduleForm.vue b/src/views/modules/communityParty/orgActivity/activivityList/scheduleForm.vue
index ed023e7b5..9546cbea2 100644
--- a/src/views/modules/communityParty/orgActivity/activivityList/scheduleForm.vue
+++ b/src/views/modules/communityParty/orgActivity/activivityList/scheduleForm.vue
@@ -14,14 +14,14 @@
                       style="display: block">
           <el-input class="item_width_1"
                     placeholder="请输入活动标题"
-                    v-model="formData.title">
+                    v-model.trim="formData.title">
           </el-input>
         </el-form-item>
         <el-form-item label="日程时间"
                       style="display: block"
                       prop="happenedTime"
                       label-width="150px">
-          <el-date-picker v-model="formData.happenedTime"
+          <el-date-picker v-model.trim="formData.happenedTime"
                           value-format="yyyy-MM-dd HH:mm:ss"
                           format="yyyy-MM-dd"
                           type="date"
@@ -32,7 +32,7 @@
                       style="display: block"
                       prop="remindTime"
                       label-width="150px">
-          <el-date-picker v-model="formData.remindTime"
+          <el-date-picker v-model.trim="formData.remindTime"
                           value-format="yyyy-MM-dd HH:mm:ss"
                           format="yyyy-MM-dd"
                           placeholder="选择时间">
@@ -42,7 +42,7 @@
         <el-form-item label="是否公开"
                       label-width="150px"
                       prop="isPublic">
-          <el-select v-model="formData.isPublic"
+          <el-select v-model.trim="formData.isPublic"
                      placeholder="请选择"
                      clearable
                      class="item_width_1">
@@ -64,7 +64,7 @@
                     show-word-limit
                     :rows="3"
                     placeholder="请输入日程介绍，不超过500字"
-                    v-model="formData.remark"></el-input>
+                    v-model.trim="formData.remark"></el-input>
         </el-form-item>
 
       </el-form>
diff --git a/src/views/modules/communityParty/orgActivity/activivityList/scheduleList.vue b/src/views/modules/communityParty/orgActivity/activivityList/scheduleList.vue
index 217303169..d05286604 100644
--- a/src/views/modules/communityParty/orgActivity/activivityList/scheduleList.vue
+++ b/src/views/modules/communityParty/orgActivity/activivityList/scheduleList.vue
@@ -9,7 +9,7 @@
           <div>
             <el-form-item label="日程时间"
                           prop="startTime">
-              <el-date-picker v-model="formData.startTime"
+              <el-date-picker v-model.trim="formData.startTime"
                               class="item_width_2"
                               size="small"
                               type="date"
@@ -18,7 +18,7 @@
                               placeholder="开始时间">
               </el-date-picker>
               <span class="u-data-tag">至</span>
-              <el-date-picker v-model="formData.endTime"
+              <el-date-picker v-model.trim="formData.endTime"
                               :picker-options="endPickerOptions"
                               class="item_width_2 u-data-tag"
                               size="small"
@@ -30,7 +30,7 @@
             </el-form-item>
             <el-form-item label="日程标题"
                           prop="topic">
-              <el-input v-model="formData.title"
+              <el-input v-model.trim="formData.title"
                         class="item_width_2"
                         size="small"
                         clearable
@@ -40,7 +40,7 @@
 
             <el-form-item label="是否公开"
                           prop="isPublic">
-              <el-select v-model="formData.isPublic"
+              <el-select v-model.trim="formData.isPublic"
                          clearable
                          placeholder="请选择">
                 <el-option v-for="item in isPublicList"
@@ -224,14 +224,14 @@
                       style="display: block">
           <el-input class="item_width_1"
                     placeholder="请输入活动标题"
-                    v-model="scFormData.title">
+                    v-model.trim="scFormData.title">
           </el-input>
         </el-form-item>
         <el-form-item label="日程时间"
                       style="display: block"
                       prop="happenedTime"
                       label-width="150px">
-          <el-date-picker v-model="scFormData.happenedTime"
+          <el-date-picker v-model.trim="scFormData.happenedTime"
                           value-format="yyyy-MM-dd HH:mm:ss"
                           format="yyyy-MM-dd HH:mm:ss"
                           type="datetime"
@@ -242,7 +242,7 @@
                       style="display: block"
                       prop="remindTime"
                       label-width="150px">
-          <el-date-picker v-model="scFormData.remindTime"
+          <el-date-picker v-model.trim="scFormData.remindTime"
                           value-format="yyyy-MM-dd HH:mm:ss"
                           format="yyyy-MM-dd"
                           type="date"
@@ -252,7 +252,7 @@
         <el-form-item label="是否公开"
                       label-width="150px"
                       prop="isPublic">
-          <el-select v-model="scFormData.isPublic"
+          <el-select v-model.trim="scFormData.isPublic"
                      placeholder="请选择"
                      clearable
                      class="item_width_1">
@@ -273,7 +273,7 @@
                     show-word-limit
                     :rows="3"
                     placeholder="请输入日程介绍，不超过500字"
-                    v-model="scFormData.remark"></el-input>
+                    v-model.trim="scFormData.remark"></el-input>
         </el-form-item>
       </el-form>
       <span slot="footer"
diff --git a/src/views/modules/communityParty/orgActivity/activivityList/yearplanList.vue b/src/views/modules/communityParty/orgActivity/activivityList/yearplanList.vue
index bbaf8abda..9fb869e2f 100644
--- a/src/views/modules/communityParty/orgActivity/activivityList/yearplanList.vue
+++ b/src/views/modules/communityParty/orgActivity/activivityList/yearplanList.vue
@@ -10,7 +10,7 @@
 
             <el-form-item label="选择计划年度"
                           prop="serviceCategoryKey">
-              <el-date-picker v-model="formData.yearId"
+              <el-date-picker v-model.trim="formData.yearId"
                               value-format="yyyy"
                               type="year"
                               placeholder="选择年"
@@ -18,7 +18,7 @@
                               style="width: 150px">
               </el-date-picker>
 
-              <!-- <el-select v-model="formData.yearId"
+              <!-- <el-select v-model.trim="formData.yearId"
                          placeholder="请选择"
                          size="small"
                          class="item_width_2">
diff --git a/src/views/modules/communityParty/partyOrg/centerMember.vue b/src/views/modules/communityParty/partyOrg/centerMember.vue
index 72d1dc603..0d772eb91 100644
--- a/src/views/modules/communityParty/partyOrg/centerMember.vue
+++ b/src/views/modules/communityParty/partyOrg/centerMember.vue
@@ -13,7 +13,7 @@
                 style="width: 100%">
         <el-table-column label="党员中心户" align="center" prop="partyMemberName">
           <template slot-scope="scope">
-            <el-select v-model="scope.row.partyMemberId"
+            <el-select v-model.trim="scope.row.partyMemberId"
                        v-if="scope.row.isEdit"
                        filterable>
               <el-option v-for="cm in centerMemberSelectorOptions"
@@ -28,7 +28,7 @@
         <el-table-column label="联系家庭" align="center" prop="partyMemberName" :width="'500px'">
           <template slot-scope="scope">
 
-            <!--v-model="scope.row.bindedHouses"-->
+            <!--v-model.trim="scope.row.bindedHouses"-->
             <el-cascader :options="bindingHouseOptions"
                          clearable
                          ref="houseTreeRef"
@@ -36,7 +36,7 @@
                          placeholder="请选择"
                          v-if="scope.row.isEdit"
                          @change=""
-                         v-model="scope.row.bindedHouses"
+                         v-model.trim="scope.row.bindedHouses"
                          :props="bindingProps">
             </el-cascader>
             <div v-else>{{ scope.row.bindedHousesStr }}</div>
diff --git a/src/views/modules/communityParty/partyOrg/create.vue b/src/views/modules/communityParty/partyOrg/create.vue
index 77c330c1d..14f639132 100644
--- a/src/views/modules/communityParty/partyOrg/create.vue
+++ b/src/views/modules/communityParty/partyOrg/create.vue
@@ -13,7 +13,7 @@
 
       <el-form-item prop="partyOrgLevel"
                     label="党组织类型">
-        <el-select v-model="dataForm.partyOrgLevel"
+        <el-select v-model.trim="dataForm.partyOrgLevel"
                    @change="handlePartyOrgLevelSelected"
                    clearable
                    placeholder="请选择">
@@ -28,7 +28,7 @@
       
       <el-form-item prop="partyOrgPid"
                     label="上级党组织">
-        <el-select v-model="dataForm.partyOrgPid"
+        <el-select v-model.trim="dataForm.partyOrgPid"
                    @change="handleParentPartyOrgSelected"
                    clearable
                    placeholder="请选择">
@@ -44,7 +44,7 @@
       <el-form-item prop="orgId"
                     label="行政组织"
                     v-show="xingzhengSelectorVisible">
-        <el-select v-model="dataForm.orgId"
+        <el-select v-model.trim="dataForm.orgId"
                    @change="handleXingzhengOrgSelected"
                    value-key="orgId"
                    clearable
@@ -60,7 +60,7 @@
 
       <el-form-item prop="principalId"
                     label="负责人">
-        <el-select v-model="dataForm.principalId"
+        <el-select v-model.trim="dataForm.principalId"
                    @change=""
                    clearable
                    placeholder="请选择">
@@ -75,7 +75,7 @@
 
       <el-form-item prop="partyOrgName"
                     label="党组织名称">
-        <el-input v-model="dataForm.partyOrgName"
+        <el-input v-model.trim="dataForm.partyOrgName"
                   placeholder="请输入党组织名称"
                   style="width: 300px"></el-input>
       </el-form-item>
@@ -85,7 +85,7 @@
             type="textarea"
             :rows="2"
             placeholder="请输入党组织介绍"
-            v-model="dataForm.description">
+            v-model.trim="dataForm.description">
         </el-input>
       </el-form-item>
 
@@ -93,7 +93,7 @@
                     prop="longitude"
                     style="display: block">
         <div style="width: 500px">
-          <el-select v-model="searchValue"
+          <el-select v-model.trim="searchValue"
                      filterable
                      style="width: 500px"
                      remote
diff --git a/src/views/modules/communityParty/partyOrg/select_principal.vue b/src/views/modules/communityParty/partyOrg/select_principal.vue
index f4ed6d98d..666ba4f63 100644
--- a/src/views/modules/communityParty/partyOrg/select_principal.vue
+++ b/src/views/modules/communityParty/partyOrg/select_principal.vue
@@ -14,7 +14,7 @@
 
       <el-form-item prop="principalId"
                     label="负责人">
-        <el-select v-model="dataForm.principalId"
+        <el-select v-model.trim="dataForm.principalId"
                    @change="handlePrincipalChanged"
                    clearable
                    @clear="resetForm"
@@ -30,7 +30,7 @@
 
       <el-form-item prop="principalMobile"
                     label="手机号">
-        <el-input v-model="dataForm.principalMobile"
+        <el-input v-model.trim="dataForm.principalMobile"
                   readonly
                   style="width: 300px"></el-input>
       </el-form-item>
diff --git a/src/views/modules/communityParty/partyOrg/update.vue b/src/views/modules/communityParty/partyOrg/update.vue
index c75642090..faa686dac 100644
--- a/src/views/modules/communityParty/partyOrg/update.vue
+++ b/src/views/modules/communityParty/partyOrg/update.vue
@@ -29,7 +29,7 @@
 
       <el-form-item prop="principalId"
                     label="负责人">
-        <el-select v-model="dataForm.principalId"
+        <el-select v-model.trim="dataForm.principalId"
                    @change=""
                    clearable
                    placeholder="请选择">
@@ -44,7 +44,7 @@
 
       <el-form-item prop="partyOrgName"
                     label="党组织名称">
-        <el-input v-model="dataForm.partyOrgName"
+        <el-input v-model.trim="dataForm.partyOrgName"
                   placeholder="请输入党组织名称"
                   style="width: 300px"></el-input>
       </el-form-item>
@@ -54,7 +54,7 @@
             type="textarea"
             :rows="2"
             placeholder="请输入内容"
-            v-model="dataForm.description">
+            v-model.trim="dataForm.description">
         </el-input>
       </el-form-item>
 
@@ -62,7 +62,7 @@
                     prop="longitude"
                     style="display: block">
         <div style="width: 500px">
-          <el-select v-model="dataForm.address"
+          <el-select v-model.trim="dataForm.address"
                      filterable
                      style="width: 500px"
                      remote
diff --git a/src/views/modules/communityParty/regionalParty/activitys.vue b/src/views/modules/communityParty/regionalParty/activitys.vue
index 0dea28e16..c3072714a 100644
--- a/src/views/modules/communityParty/regionalParty/activitys.vue
+++ b/src/views/modules/communityParty/regionalParty/activitys.vue
@@ -10,7 +10,7 @@
           <el-form-item label="单位名称"
                         prop="unitId">
             <el-select class="item_width_1"
-                       v-model="formData.unitId"
+                       v-model.trim="formData.unitId"
                        size="small"
                        placeholder="全部"
                        clearable>
@@ -25,7 +25,7 @@
 
           <el-form-item label="服务事项" prop="serviceMatter">
               <el-cascader
-                v-model="formData.serviceMatter"
+                v-model.trim="formData.serviceMatter"
                 class="u-item-width-daterange2"
                 size="small"
                 :options="searchdemandOptions"
@@ -37,7 +37,7 @@
           <el-form-item label="所属网格"
                         prop="gridId">
             <el-select class="item_width_1"
-                       v-model="formData.gridId"
+                       v-model.trim="formData.gridId"
                        placeholder="全部"
                        clearable>
               <el-option v-for="item in gridList"
@@ -53,7 +53,7 @@
         <div>
           <el-form-item label="活动标题"
                         prop="title">
-            <el-input v-model="formData.title"
+            <el-input v-model.trim="formData.title"
                       size="small"
                       class="item_width_1"
                       clearable
@@ -64,7 +64,7 @@
 
           <el-form-item label="活动时间"
                         prop="startTime">
-            <el-date-picker v-model="timeRange"
+            <el-date-picker v-model.trim="timeRange"
                             size="small"
                             type="daterange"
                             value-format="yyyy-MM-dd HH:mm:ss"
diff --git a/src/views/modules/communityParty/regionalParty/activitysForm.vue b/src/views/modules/communityParty/regionalParty/activitysForm.vue
index dfd877bf8..11e23b78b 100644
--- a/src/views/modules/communityParty/regionalParty/activitysForm.vue
+++ b/src/views/modules/communityParty/regionalParty/activitysForm.vue
@@ -12,7 +12,7 @@
                       label-width="150px"
                       prop="gridId">
           <el-select class="item_width_1"
-                     v-model="formData.gridId"
+                     v-model.trim="formData.gridId"
                      placeholder="请选择"
                      clearable>
             <el-option v-for="item in gridList"
@@ -26,7 +26,7 @@
 
         <el-form-item label="服务事项" prop="serviceMatterList" label-width="150px">
           <el-cascader
-            v-model="formData.serviceMatterList"
+            v-model.trim="formData.serviceMatterList"
             :options="demandOptions"
             :props="{label: 'categoryName',value: 'categoryCode',children: 'childCateList',multiple:true,emitPath:false}"
             clearable
@@ -41,14 +41,14 @@
                       style="display: block">
           <el-checkbox-group class="item_width_1"
                              style="display:flex;flex-wrap:wrap"
-                             v-model="formData.unitIdList">
+                             v-model.trim="formData.unitIdList">
             <el-checkbox v-for="item in unitList"
                          :key="item.value"
                          :label="item.value">{{item.label}}</el-checkbox>
 
           </el-checkbox-group>
           <!-- <el-select class="item_width_1"
-                     v-model="formData.unitId"
+                     v-model.trim="formData.unitId"
                      placeholder="请选择"
                      clearable>
             <el-option v-for="item in unitList"
@@ -67,7 +67,7 @@
                     maxlength="50"
                     show-word-limit
                     placeholder="请输入活动标题"
-                    v-model="formData.title">
+                    v-model.trim="formData.title">
           </el-input>
         </el-form-item>
 
@@ -81,7 +81,7 @@
                     show-word-limit
                     :rows="3"
                     placeholder="请输入活动目标，不超过100字"
-                    v-model="formData.target"></el-input>
+                    v-model.trim="formData.target"></el-input>
         </el-form-item>
         <el-form-item label="活动内容"
                       prop="target"
@@ -90,7 +90,7 @@
           <div class="item_width_1">
             <Tinymce class="tinymce_view "
                      v-if="formType!='detail'"
-                     v-model="formData.content"
+                     v-model.trim="formData.content"
                      :height="250"
                      placeholder="在这里输入文字" />
 
@@ -105,7 +105,7 @@
                       prop="peopleCount"
                       label-width="150px">
           <el-input-number class="item_width_4"
-                           v-model="formData.peopleCount"
+                           v-model.trim="formData.peopleCount"
                            :min="0"
                            :max="9999"
                            label="服务人数"></el-input-number>
@@ -114,7 +114,7 @@
                       style="display: block"
                       prop="activityTime"
                       label-width="150px">
-          <el-date-picker v-model="formData.activityTime"
+          <el-date-picker v-model.trim="formData.activityTime"
                           value-format="yyyy-MM-dd HH:mm:ss"
                           type="datetime"
                           placeholder="选择时间">
@@ -126,7 +126,7 @@
                       label-width="150px"
                       style="display: block">
           <div style="width: 500px">
-            <el-select v-model="searchValue"
+            <el-select v-model.trim="searchValue"
                        filterable
                        style="width: 500px"
                        remote
@@ -152,7 +152,7 @@
                       style="display: block">
 
           <el-input class="item_width_1"
-                    v-model="formData.address">
+                    v-model.trim="formData.address">
           </el-input>
 
         </el-form-item>
@@ -164,7 +164,7 @@
           <div class="item_width_1">
             <Tinymce class="tinymce_view "
                      v-if="formType!='detail'"
-                     v-model="formData.result"
+                     v-model.trim="formData.result"
                      :height="250"
                      placeholder="在这里输入文字" />
 
diff --git a/src/views/modules/communityParty/regionalParty/finishList.vue b/src/views/modules/communityParty/regionalParty/finishList.vue
index 3224eb85b..f3debe771 100644
--- a/src/views/modules/communityParty/regionalParty/finishList.vue
+++ b/src/views/modules/communityParty/regionalParty/finishList.vue
@@ -28,7 +28,7 @@
             <div v-if="scope.row.isEdit"
                  class="picker_year">
               <!-- <el-select class="item_width_2"
-                         v-model="scope.row.year"
+                         v-model.trim="scope.row.year"
                          placeholder="请选择">
                 <el-option v-for="(item,index) in yearList"
                            @click.native="hancleChangeYear(scope.row,index,scope.$index)"
@@ -37,7 +37,7 @@
                            :value="item.value">
                 </el-option>
               </el-select> -->
-              <el-date-picker v-model="scope.row.year"
+              <el-date-picker v-model.trim="scope.row.year"
                               type="year"
                               format="yyyy"
                               value-format="yyyy"
@@ -57,7 +57,7 @@
           <template slot-scope="scope">
             <div v-if="scope.row.isEdit">
               <el-select class="item_width_2"
-                         v-model="scope.row.type"
+                         v-model.trim="scope.row.type"
                          placeholder="请选择">
                 <el-option v-for="(item,index) in typeList"
                            @click.native="hancleChangeType(scope.row,index,scope.$index)"
@@ -80,7 +80,7 @@
           <template slot-scope="scope">
             <div v-if="scope.row.isEdit">
               <el-select class="item_width_3"
-                         v-model="scope.row.monthQuarter"
+                         v-model.trim="scope.row.monthQuarter"
                          placeholder="请选择">
                 <el-option v-for="item in scope.row.timeList"
                            :key="item.value"
@@ -101,7 +101,7 @@
           <template slot-scope="scope">
             <div v-if="scope.row.isEdit">
               <el-select class="item_width_2"
-                         v-model="scope.row.status"
+                         v-model.trim="scope.row.status"
                          placeholder="全部">
                 <el-option v-for="item in statusList"
                            :key="item.value"
@@ -125,7 +125,7 @@
                         v-model.number="scope.row.score" 
               onkeyup="this.value = this.value.replace(/[^\d.]/g,'');"></el-input>-->
               <el-input-number class="item_width_1"
-                               v-model="scope.row.score"
+                               v-model.trim="scope.row.score"
                                :precision="1"
                                :controls="false"
                                :max="100"></el-input-number>
diff --git a/src/views/modules/communityParty/regionalParty/units.vue b/src/views/modules/communityParty/regionalParty/units.vue
index 4814c6cc3..d1615137f 100644
--- a/src/views/modules/communityParty/regionalParty/units.vue
+++ b/src/views/modules/communityParty/regionalParty/units.vue
@@ -9,7 +9,7 @@
       >
         <el-form-item label="单位名称" prop="unitName">
           <el-input
-            v-model="formData.unitName"
+            v-model.trim="formData.unitName"
             class="u-item-width-normal"
             clearable
             size="small"
@@ -19,7 +19,7 @@
         </el-form-item>
         <el-form-item label="服务事项" prop="serviceMatter">
               <el-cascader
-                v-model="formData.serviceMatter"
+                v-model.trim="formData.serviceMatter"
                 class="u-item-width-daterange2"
                 size="small"
                 :options="searchdemandOptions"
@@ -32,7 +32,7 @@
         <el-form-item label="分类" prop="type">
           <el-select
             class="u-item-width-normal"
-            v-model="formData.type"
+            v-model.trim="formData.type"
             placeholder="请选择"
             size="small"
             clearable
@@ -48,7 +48,7 @@
         </el-form-item>
         <el-form-item label="联系人" prop="contact">
           <el-input
-            v-model="formData.contact"
+            v-model.trim="formData.contact"
             class="u-item-width-normal"
             size="small"
             clearable
@@ -59,7 +59,7 @@
 
         <el-form-item label="联系电话" prop="contactMobile">
           <el-input
-            v-model="formData.contactMobile"
+            v-model.trim="formData.contactMobile"
             class="u-item-width-normal"
             size="small"
             clearable
diff --git a/src/views/modules/communityParty/regionalParty/unitsForm.vue b/src/views/modules/communityParty/regionalParty/unitsForm.vue
index b85c95820..14a3c20dd 100644
--- a/src/views/modules/communityParty/regionalParty/unitsForm.vue
+++ b/src/views/modules/communityParty/regionalParty/unitsForm.vue
@@ -20,7 +20,7 @@
             maxlength="50"
             show-word-limit
             placeholder="请输入单位名称"
-            v-model="formData.unitName"
+            v-model.trim="formData.unitName"
           >
           </el-input>
         </el-form-item>
@@ -32,7 +32,7 @@
         >
           <el-select
             class="item_width_1"
-            v-model="formData.type"
+            v-model.trim="formData.type"
             placeholder="请选择"
             filterable
             clearable
@@ -55,7 +55,7 @@
           <el-checkbox-group
             class="item_width_1"
             style="display: flex; flex-wrap: wrap"
-            v-model="formData.serviceMatterList"
+            v-model.trim="formData.serviceMatterList"
           >
             <el-checkbox
               v-for="item in serviceList"
@@ -67,7 +67,7 @@
         </el-form-item> -->
         <el-form-item label="服务事项" prop="serviceMatterList" label-width="150px">
           <el-cascader
-            v-model="formData.serviceMatterList"
+            v-model.trim="formData.serviceMatterList"
             :options="demandOptions"
             :props="{label: 'categoryName',value: 'categoryCode',children: 'childCateList',multiple:true,emitPath:false}"
             clearable
@@ -76,7 +76,7 @@
             class="u-item-width-normal"
           ></el-cascader>
         </el-form-item>
-        <el-form-item
+        <!-- <el-form-item
           label="联系人"
           prop="contact"
           label-width="150px"
@@ -85,9 +85,18 @@
           <el-input
             class="item_width_1"
             placeholder="请输入联系人姓名"
-            v-model="formData.contact"
+            v-model.trim="formData.contact"
           >
           </el-input>
+        </el-form-item> -->
+        <el-form-item label="联系人" prop="contact">
+          <el-select v-model.trim="formData.contact" class="u-item-width-normal" size="small" clearable
+            placeholder="请选择联系人">
+            <el-option v-for="item in dicts.stafflist"
+                  :key="item.value"
+                  :label="item.name"
+                  :value="item.name"></el-option>
+          </el-select>
         </el-form-item>
         <el-form-item
           label="联系电话"
@@ -98,7 +107,7 @@
           <el-input
             class="item_width_1"
             placeholder="请输入联系人电话"
-            v-model="formData.contactMobile"
+            v-model.trim="formData.contactMobile"
           >
           </el-input>
         </el-form-item>
@@ -110,7 +119,7 @@
         >
           <el-input-number
             class="item_width_4"
-            v-model="formData.memberCount"
+            v-model.trim="formData.memberCount"
             :min="0"
             :max="9999"
             label="在职党员"
@@ -129,7 +138,7 @@
             show-word-limit
             :rows="3"
             placeholder="请输入备注，不超过500字"
-            v-model="formData.remark"
+            v-model.trim="formData.remark"
           ></el-input>
         </el-form-item>
         <el-form-item
@@ -140,7 +149,7 @@
         >
           <div style="width: 500px">
             <el-select
-              v-model="searchValue"
+              v-model.trim="searchValue"
               filterable
               style="width: 500px"
               remote
@@ -168,7 +177,7 @@
           label-width="150px"
           style="display: block"
         >
-          <el-input class="item_width_1" v-model="formData.address"> </el-input>
+          <el-input class="item_width_1" v-model.trim="formData.address"> </el-input>
         </el-form-item>
       </el-form>
     </div>
@@ -216,6 +225,9 @@ export default {
       return _form;
     };
     return {
+      dicts: {
+        stafflist: [],
+      }, //字典对象
       formType: "add", //表单操作类型 add新增，edit编辑，detail详情
       searchOptions: [],
       searchValue: "",
@@ -235,9 +247,25 @@ export default {
   components: {},
   mounted() {
     // this.initMap()
+    const { user } = this.$store.state;
+    this.agencyId = user.agencyId;
+    this.getStafflist()
+   
   },
 
   methods: {
+    getStafflist() {
+      let parms = {
+        orgId: this.agencyId,
+        orgType: "agency",
+        pageNo: 1,
+        pageSize: 100,
+      };
+      this.$http.post("data/aggregator/org/stafflist", parms).then((resp) => {
+        this.dicts.stafflist = resp.data.data.staffList;
+        console.log("stafflist", resp.data);
+      });
+    },
     async initForm(type, unitId) {
       this.startLoading();
       this.$refs.ref_form.resetFields();
diff --git a/src/views/modules/communityParty/stas/index.vue b/src/views/modules/communityParty/stas/index.vue
index 0e6ba3c51..2c55870e5 100644
--- a/src/views/modules/communityParty/stas/index.vue
+++ b/src/views/modules/communityParty/stas/index.vue
@@ -10,7 +10,7 @@
                         label-width="130px"
                         label="参加活动党组织">
             <el-cascader class="list_item_width_1"
-                         v-model="joinOrgIds"
+                         v-model.trim="joinOrgIds"
                          size="small"
                          :options="orgList"
                          placeholder="请选择党组织"
@@ -25,7 +25,7 @@
           </el-form-item>
           <el-form-item label="活动开始时间"
                         prop="serviceTimeArea">
-            <el-date-picker v-model="serviceTimeArea"
+            <el-date-picker v-model.trim="serviceTimeArea"
                             clearable
                             type="daterange"
                             format="yyyy-MM-dd"
diff --git a/src/views/modules/communityService/commonDemand/addForm.vue b/src/views/modules/communityService/commonDemand/addForm.vue
index 3cd4026b8..f6d1fa1d2 100644
--- a/src/views/modules/communityService/commonDemand/addForm.vue
+++ b/src/views/modules/communityService/commonDemand/addForm.vue
@@ -5,13 +5,13 @@
         class="div_form">
         <!-- 服务类别 -->
         <el-form-item label="服务类别" style="display: block" label-width="150px" prop="serviceTypeLevel2Id">
-          <el-select class="u-item-width-communitycascader" v-model="formData.serviceTypeLevel1Id" placeholder="请选择"
+          <el-select class="u-item-width-communitycascader" v-model.trim="formData.serviceTypeLevel1Id" placeholder="请选择"
             clearable @change="handleChangeServiceTypeLevel1">
             <el-option v-for="item in serviceTypesLevel1" :key="item.id" :label="item.name" :value="item.id">
             </el-option>
           </el-select>
           -
-          <el-select class="u-item-width-communitycascader" v-model="formData.serviceTypeLevel2Id" placeholder="请选择"
+          <el-select class="u-item-width-communitycascader" v-model.trim="formData.serviceTypeLevel2Id" placeholder="请选择"
             @change="handleChangeServiceTypeLevel2" clearable>
             <el-option v-for="item in serviceTypesLevel2" :key="item.id" :label="item.name" :value="item.id">
             </el-option>
@@ -20,29 +20,29 @@
 
         <el-form-item label="服务事项" prop="serviceName" label-width="150px" :class="{ 'form-item': source === 'visiual' }"
           style="display: block">
-          <el-input class="item_width_1" placeholder="请输入服务事项" v-model="formData.serviceName">
+          <el-input class="item_width_1" placeholder="请输入服务事项" v-model.trim="formData.serviceName">
           </el-input>
         </el-form-item>
 
         <el-form-item label="服务内容" prop="remark" label-width="150px" :class="{ 'form-item': source === 'visiual' }"
           style="display: block">
           <el-input class="item_width_1" type="textarea" maxlength="1000" show-word-limit :rows="3"
-            placeholder="请输入服务内容，不超过1000字" v-model="formData.remark"></el-input>
+            placeholder="请输入服务内容，不超过1000字" v-model.trim="formData.remark"></el-input>
         </el-form-item>
 
         <el-form-item label="服务范围" prop="objList" label-width="150px" :class="{ 'form-item': source === 'visiual' }"
           style="display: block">
-          <el-cascader class="item_width_1" ref="myCascader" v-model="scopeIdArray" collapse-tags :key="iscascaderShow"
+          <el-cascader class="item_width_1" ref="myCascader" v-model.trim="scopeIdArray" collapse-tags :key="iscascaderShow"
             :options="casOptions" :props="optionProps" :show-all-levels="false" @change="handleChangeScope"></el-cascader>
         </el-form-item>
 
         <el-form-item label="服务时间" label-width="150px" :class="{ 'form-item': source === 'visiual' }"
           prop="serviceTimeStart">
-          <el-date-picker v-model="formData.serviceTimeStart" :picker-options="startPickerOptions" class="item_width_2"
+          <el-date-picker v-model.trim="formData.serviceTimeStart" :picker-options="startPickerOptions" class="item_width_2"
             style="width: 220px" type="date" value-format="yyyy-MM-dd HH:mm:ss" value="yyyy-MM-dd" placeholder="开始时间">
           </el-date-picker>
           <span class="u-data-tag">至</span>
-          <el-date-picker v-model="formData.serviceTimeEnd" :picker-options="endPickerOptions"
+          <el-date-picker v-model.trim="formData.serviceTimeEnd" :picker-options="endPickerOptions"
             class="item_width_2 u-data-tag" style="width: 220px" type="date" value-format="yyyy-MM-dd HH:mm:ss"
             value="yyyy-MM-dd" placeholder="结束时间">
           </el-date-picker>
@@ -50,7 +50,7 @@
 
         <el-form-item label="政策依据" prop="policyId" label-width="150px" :class="{ 'form-item': source === 'visiual' }"
           style="display: block">
-          <el-select v-model="formData.policyId" class="input-width-small" placeholder="请选择" clearable>
+          <el-select v-model.trim="formData.policyId" class="input-width-small" placeholder="请选择" clearable>
             <el-option v-for="item in policyList" :key="item.id" :label="item.title" :value="item.id">
             </el-option>
           </el-select>
@@ -66,23 +66,23 @@
 
         <el-form-item label="经办人" prop="principalName" :class="{ 'form-item': source === 'visiual' }" label-width="150px"
           style="display: block">
-          <el-input class="item_width_1" placeholder="请输入联系人姓名" v-model="formData.principalName">
+          <el-input class="item_width_1" placeholder="请输入联系人姓名" v-model.trim="formData.principalName">
           </el-input>
         </el-form-item>
         <el-form-item label="联系方式" prop="principalContact" :class="{ 'form-item': source === 'visiual' }"
           label-width="150px" style="display: block">
-          <el-input class="item_width_1" placeholder="请输入联系人电话" v-model="formData.principalContact">
+          <el-input class="item_width_1" placeholder="请输入联系人电话" v-model.trim="formData.principalContact">
           </el-input>
         </el-form-item>
 
         <el-form-item label="指派服务" label-width="150px">
-          <el-switch v-model="formData.assignFlag" @change="handelDisabledRules">
+          <el-switch v-model.trim="formData.assignFlag" @change="handelDisabledRules">
           </el-switch>
         </el-form-item>
 
         <el-form-item label="查找享受服务人员" prop="resiSearchTagId" :class="{ 'form-item': source === 'visiual' }"
           label-width="150px" style="display: block" v-if="formData.assignFlag">
-          <input type="text" v-model="formData.resiSearchTagId" v-show="false" />
+          <input type="text" v-model.trim="formData.resiSearchTagId" v-show="false" />
           <template v-if="formData.resiSearchTagName">
             <el-tag @close="handleCloseTag" closable style="margin-right: 10px">
               {{ formData.resiSearchTagName }}
@@ -96,13 +96,13 @@
 
         <el-form-item label="服务组织" prop="serviceOrgId" label-width="150px" :class="{ 'form-item': source === 'visiual' }"
           style="display: block">
-          <el-select v-model="formData.serviceOrgType" class="input-width-small" placeholder="请选择" clearable
+          <el-select v-model.trim="formData.serviceOrgType" class="input-width-small" placeholder="请选择" clearable
             @change="handleServiceChange('add', $event)">
             <el-option v-for="item in serviceOptions" :key="item.value" :label="item.label" :value="item.value">
             </el-option>
           </el-select>
           -
-          <el-select v-model="formData.serviceOrgId" class="input-width-middle" filterable placeholder="请选择" clearable>
+          <el-select v-model.trim="formData.serviceOrgId" class="input-width-middle" filterable placeholder="请选择" clearable>
             <el-option v-for="item in serviceOptiondList" :key="item.id" :label="item.name" :value="item.id">
             </el-option>
           </el-select>
@@ -110,7 +110,7 @@
 
         <el-form-item label="直接反馈" prop="remark" label-width="150px" :class="{ 'form-item': source === 'visiual' }"
           style="display: block">
-          <el-checkbox :label="'是'" v-model="showFeedback" @change="handleChangeFeedback"></el-checkbox>
+          <el-checkbox :label="'是'" v-model.trim="showFeedback" @change="handleChangeFeedback"></el-checkbox>
         </el-form-item>
       </el-form>
       <div v-show="formType === 'feedback' || showFeedback">
@@ -120,7 +120,7 @@
           class="div_form">
           <el-form-item label="满意度" style="display: block" label-width="150px"
             :class="{ 'form-item': source === 'visiual' }" prop="satisfaction">
-            <el-select class="item_width_2" v-model="feedbackFormData.satisfaction" placeholder="全部" clearable>
+            <el-select class="item_width_2" v-model.trim="feedbackFormData.satisfaction" placeholder="全部" clearable>
               <el-option v-for="item in satisfyArray" :key="item.value" :label="item.label" :value="item.value">
               </el-option>
             </el-select>
@@ -128,7 +128,7 @@
           <el-form-item label="备注" prop="serviceGoal" :class="{ 'form-item': source === 'visiual' }" label-width="150px"
             style="display: block">
             <el-input class="item_width_1" type="textarea" maxlength="1000" show-word-limit :rows="3"
-              v-model="feedbackFormData.serviceGoal"></el-input>
+              v-model.trim="feedbackFormData.serviceGoal"></el-input>
           </el-form-item>
           </el-form>
       </div>
diff --git a/src/views/modules/communityService/commonDemand/editForm.vue b/src/views/modules/communityService/commonDemand/editForm.vue
index 048debd27..1d48a2351 100644
--- a/src/views/modules/communityService/commonDemand/editForm.vue
+++ b/src/views/modules/communityService/commonDemand/editForm.vue
@@ -5,7 +5,7 @@
         <el-form-item label="服务名称" prop="serviceName" label-width="150px" style="display: block">
           <span>{{ formData.serviceName }}</span>
           <!-- <el-select class="item_width_1"
-                       v-model="formData.serviceProjectId"
+                       v-model.trim="formData.serviceProjectId"
                        placeholder="请选择"
                        filterable
                        clearable>
@@ -20,7 +20,7 @@
         <el-form-item label="服务组织" prop="serviceOrgId" label-width="150px" style="display: block">
           <span>{{ serviceOrgName }}</span>
           <!-- <el-select class="item_width_1"
-                       v-model="formData.serviceOrgId"
+                       v-model.trim="formData.serviceOrgId"
                        placeholder="请选择"
                        filterable
                        clearable>
@@ -38,7 +38,7 @@
           </div>
           <!-- <el-cascader class="item_width_1"
                          ref="myCascader"
-                         v-model="scopeIdArray"
+                         v-model.trim="scopeIdArray"
                          :key="iscascaderShow"
                          :options="casOptions"
                          :props="optionProps"
@@ -46,20 +46,20 @@
                          @change="handleChangeScope"></el-cascader> -->
         </el-form-item>
         <el-form-item label="服务类别" style="display: block" label-width="150px" prop="serviceTypeLevel2Id">
-          <el-select class="u-item-width-communitycascader" v-model="formData.serviceTypeLevel1Id" placeholder="请选择"
+          <el-select class="u-item-width-communitycascader" v-model.trim="formData.serviceTypeLevel1Id" placeholder="请选择"
             clearable @change="handleChangeServiceTypeLevel1">
             <el-option v-for="item in serviceTypesLevel1" :key="item.id" :label="item.name" :value="item.id">
             </el-option>
           </el-select>
           -
-          <el-select class="u-item-width-communitycascader" v-model="formData.serviceTypeLevel2Id" placeholder="请选择"
+          <el-select class="u-item-width-communitycascader" v-model.trim="formData.serviceTypeLevel2Id" placeholder="请选择"
             clearable>
             <el-option v-for="item in serviceTypesLevel2" :key="item.id" :label="item.name" :value="item.id">
             </el-option>
           </el-select>
         </el-form-item>
         <el-form-item label="政策依据" prop="policyId" label-width="150px" style="display: block">
-          <el-select :disabled="formType === 'detail'" v-model="formData.policyId" class="input-width-small"
+          <el-select :disabled="formType === 'detail'" v-model.trim="formData.policyId" class="input-width-small"
             placeholder="请选择" clearable>
             <el-option v-for="item in policyList" :key="item.id" :label="item.title" :value="item.id">
             </el-option>
@@ -73,21 +73,21 @@
 
         <el-form-item label="经办人" prop="principalName" label-width="150px" style="display: block">
           <el-input :disabled="formType === 'detail'" class="item_width_1" placeholder="请输入经办人姓名"
-            v-model="formData.principalName">
+            v-model.trim="formData.principalName">
           </el-input>
         </el-form-item>
         <el-form-item label="联系方式" prop="principalContact" label-width="150px" style="display: block">
           <el-input :disabled="formType === 'detail'" class="item_width_1" placeholder="请输入联系方式"
-            v-model="formData.principalContact">
+            v-model.trim="formData.principalContact">
           </el-input>
         </el-form-item>
         <el-form-item label="指派服务" label-width="150px">
-          <el-switch v-model="formData.assignFlag"> </el-switch>
+          <el-switch v-model.trim="formData.assignFlag"> </el-switch>
         </el-form-item>
 
         <el-form-item label="查找享受服务人员" prop="resiSearchTagId" label-width="150px" style="display: block"
           v-if="this.formData.assignFlag">
-          <input type="text" v-model="formData.resiSearchTagId" v-show="false" />
+          <input type="text" v-model.trim="formData.resiSearchTagId" v-show="false" />
           <template v-if="this.resiSearchTagName">
             <el-tag @close="handleCloseTag" closable style="margin-right: 10px">
               {{ this.resiSearchTagName }}
@@ -99,12 +99,12 @@
           </el-button>
         </el-form-item>
         <el-form-item label="服务时间" label-width="150px" prop="serviceTimeStart" style="display: block">
-          <el-date-picker :disabled="formType === 'detail'" v-model="formData.serviceTimeStart"
+          <el-date-picker :disabled="formType === 'detail'" v-model.trim="formData.serviceTimeStart"
             :picker-options="startPickerOptions" class="item_width_2" type="date" value-format="yyyy-MM-dd"
             value="yyyy-MM-dd" placeholder="开始时间">
           </el-date-picker>
           <span class="u-data-tag">至</span>
-          <el-date-picker :disabled="formType === 'detail'" v-model="formData.serviceTimeEnd"
+          <el-date-picker :disabled="formType === 'detail'" v-model.trim="formData.serviceTimeEnd"
             :picker-options="endPickerOptions" class="item_width_2 u-data-tag" type="date" value-format="yyyy-MM-dd"
             value="yyyy-MM-dd" placeholder="结束时间">
           </el-date-picker>
@@ -112,7 +112,7 @@
 
         <el-form-item label="服务内容" prop="remark" label-width="150px" style="display: block">
           <el-input :disabled="formType === 'detail'" class="item_width_1" type="textarea" maxlength="500" show-word-limit
-            :rows="3" placeholder="请输入服务内容，不超过500字" v-model="formData.remark"></el-input>
+            :rows="3" placeholder="请输入服务内容，不超过500字" v-model.trim="formData.remark"></el-input>
         </el-form-item>
       </el-form>
 
@@ -122,23 +122,23 @@
         <el-form ref="ref_form_feedback" :inline="true" :disabled="true" :model="feedbackFormData" class="div_form">
           <el-form-item label="服务目标" prop="serviceGoal" label-width="150px" style="display: block">
             <el-input class="item_width_1" type="textarea" maxlength="1000" show-word-limit :rows="3"
-              placeholder="请输入服务目标，不超过1000字" v-model="feedbackFormData.serviceGoal"></el-input>
+              placeholder="请输入服务目标，不超过1000字" v-model.trim="feedbackFormData.serviceGoal"></el-input>
           </el-form-item>
 
           <el-form-item label="服务效果" prop="serviceEffect" label-width="150px" style="display: block">
             <el-input class="item_width_1" type="textarea" maxlength="1000" show-word-limit :rows="3"
-              placeholder="请输入服务效果，不超过1000字" v-model="feedbackFormData.serviceEffect"></el-input>
+              placeholder="请输入服务效果，不超过1000字" v-model.trim="feedbackFormData.serviceEffect"></el-input>
           </el-form-item>
 
           <el-form-item label="服务人数" style="display: block" prop="servicePeopleNumber" label-width="150px">
-            <el-input-number class="item_width_2" v-model="feedbackFormData.servicePeopleNumber" :min="0" :max="9999"
+            <el-input-number class="item_width_2" v-model.trim="feedbackFormData.servicePeopleNumber" :min="0" :max="9999"
               label="服务人数"></el-input-number>
           </el-form-item>
 
           <el-form-item label="服务状态" label-width="150px" style="display: block" prop="serviceStatus">
             <span>已完成</span>
             <!-- <el-select class="item_width_1"
-                         v-model="feedbackFormData.serviceStatus"
+                         v-model.trim="feedbackFormData.serviceStatus"
                          placeholder="全部"
                          clearable>
                 <el-option v-for="item in statusArray"
@@ -149,13 +149,13 @@
               </el-select> -->
           </el-form-item>
           <el-form-item label="满意度" style="display: block" label-width="150px" prop="satisfaction">
-            <el-select class="item_width_2" v-model="feedbackFormData.satisfaction" placeholder="全部" clearable>
+            <el-select class="item_width_2" v-model.trim="feedbackFormData.satisfaction" placeholder="全部" clearable>
               <el-option v-for="item in satisfyArray" :key="item.value" :label="item.label" :value="item.value">
               </el-option>
             </el-select>
           </el-form-item>
           <el-form-item label="地址" prop="address" label-width="150px" style="display: block">
-            <el-input class="item_width_1" v-model="feedbackFormData.address"></el-input>
+            <el-input class="item_width_1" v-model.trim="feedbackFormData.address"></el-input>
           </el-form-item>
           <!-- <el-form-item label="地图位置"
                           label-width="150px"
@@ -170,7 +170,7 @@
                     <el-input maxlength="50"
                               size="mini"
                               placeholder="请输入关键字"
-                              v-model="keyWords">
+                              v-model.trim="keyWords">
                     </el-input>
                     <el-button style="margin-left: 10px"
                                type="primary"
diff --git a/src/views/modules/communityService/commonDemand/index.vue b/src/views/modules/communityService/commonDemand/index.vue
index c769d9cf8..b53cfb645 100644
--- a/src/views/modules/communityService/commonDemand/index.vue
+++ b/src/views/modules/communityService/commonDemand/index.vue
@@ -47,7 +47,7 @@
 
           <el-form-item label="服务时间" prop="serviceTimeStart">
             <el-date-picker
-              v-model="formData.serviceTimeStart"
+              v-model.trim="formData.serviceTimeStart"
               :picker-options="startPickerOptions"
               class="u-item-width-daterange"
               size="small"
@@ -59,7 +59,7 @@
             </el-date-picker>
             <span class="u-data-tag">至</span>
             <el-date-picker
-              v-model="formData.serviceTimeEnd"
+              v-model.trim="formData.serviceTimeEnd"
               :picker-options="endPickerOptions"
               class="u-item-width-daterange u-data-tag"
               size="small"
@@ -73,7 +73,7 @@
 
           <el-form-item label="服务事项" prop="serviceName">
             <el-input
-              v-model="formData.serviceName"
+              v-model.trim="formData.serviceName"
               class="u-item-width-normal"
               size="small"
               clearable
@@ -84,7 +84,7 @@
 
           <el-form-item label="服务单位" prop="serviceOrgName">
             <el-input
-              v-model="formData.serviceOrgName"
+              v-model.trim="formData.serviceOrgName"
               class="u-item-width-normal"
               size="small"
               clearable
@@ -96,7 +96,7 @@
           <el-form-item label="服务状态" prop="serviceStatus">
             <el-select
               class="u-item-width-normal"
-              v-model="formData.serviceStatus"
+              v-model.trim="formData.serviceStatus"
               placeholder="全部"
               size="small"
               clearable
@@ -113,7 +113,7 @@
           <el-form-item label="满意度" prop="satisfaction">
             <el-select
               class="u-item-width-normal"
-              v-model="formData.satisfaction"
+              v-model.trim="formData.satisfaction"
               placeholder="全部"
               size="small"
               clearable
diff --git a/src/views/modules/communityService/dqfwzx/cpts/edit.vue b/src/views/modules/communityService/dqfwzx/cpts/edit.vue
index fa766c361..34d641bd2 100644
--- a/src/views/modules/communityService/dqfwzx/cpts/edit.vue
+++ b/src/views/modules/communityService/dqfwzx/cpts/edit.vue
@@ -15,7 +15,7 @@
                     maxlength="50"
                     show-word-limit
                     placeholder="请输入中心名称	"
-                    v-model="dataForm.centerName">
+                    v-model.trim="dataForm.centerName">
           </el-input>
         </el-form-item>
 
@@ -27,7 +27,7 @@
                     maxlength="50"
                     show-word-limit
                     placeholder="请输入办公电话"
-                    v-model="dataForm.workPhone">
+                    v-model.trim="dataForm.workPhone">
           </el-input>
         </el-form-item>
 
@@ -38,7 +38,7 @@
           <div class="row">
             <span>上午</span>
             <el-time-select style="margin-left: 10px"
-                            v-model="dataForm.amStartTime"
+                            v-model.trim="dataForm.amStartTime"
                             :picker-options="{
                 start: '00:00',
                 step: '00:30',
@@ -47,7 +47,7 @@
                             placeholder="开始时间">
             </el-time-select>
             <span style="margin: 0 5px">至</span>
-            <el-time-select v-model="dataForm.amEndTime"
+            <el-time-select v-model.trim="dataForm.amEndTime"
                             :picker-options="{
                 start: '00:00',
                 step: '00:30',
@@ -62,7 +62,7 @@
                style="margin-top: 5px">
             <span>下午</span>
             <el-time-select style="margin-left: 10px"
-                            v-model="dataForm.pmStartTime"
+                            v-model.trim="dataForm.pmStartTime"
                             :picker-options="{
                 start: '12:00',
                 step: '00:30',
@@ -71,7 +71,7 @@
                             placeholder="开始时间">
             </el-time-select>
             <span style="margin: 0 5px">至</span>
-            <el-time-select v-model="dataForm.pmEndTime"
+            <el-time-select v-model.trim="dataForm.pmEndTime"
                             :picker-options="{
                 start: '12:00',
                 step: '00:30',
@@ -88,7 +88,7 @@
                       label-width="150px"
                       style="display: block">
           <div style="width: 500px">
-            <el-select v-model="searchValue"
+            <el-select v-model.trim="searchValue"
                        filterable
                        style="width: 500px"
                        remote
@@ -115,7 +115,7 @@
                     maxlength="50"
                     show-word-limit
                     placeholder="请输入社区地址	"
-                    v-model="dataForm.address">
+                    v-model.trim="dataForm.address">
           </el-input>
         </el-form-item>
 
@@ -133,7 +133,7 @@
                           maxlength="50"
                           show-word-limit
                           placeholder="事项名"
-                          v-model="item.matterName"
+                          v-model.trim="item.matterName"
                           :disabled="item.matterId != undefined" />
                 <el-upload :headers="$getElUploadHeaders()"
                            :disabled="item.matterId != undefined"
@@ -159,7 +159,7 @@
 
               <div class="item-pic">
                 <el-select style="width: 150px; margin-left: 0"
-                           v-model="item.appointmentType"
+                           v-model.trim="item.appointmentType"
                            filterable
                            placeholder="预约类型"
                            :disabled="item.matterId != undefined">
@@ -171,7 +171,7 @@
                 </el-select>
 
                 <el-time-select style="width: 120px; margin-left: 20px"
-                                v-model="item.startTime"
+                                v-model.trim="item.startTime"
                                 :picker-options="{
                     start: '00:00',
                     step: '00:30',
@@ -182,7 +182,7 @@
                 </el-time-select>
                 <span style="margin: 0 5px">至</span>
                 <el-time-select style="width: 120px"
-                                v-model="item.endTime"
+                                v-model.trim="item.endTime"
                                 :picker-options="{
                     start: '00:00',
                     step: '00:30',
diff --git a/src/views/modules/communityService/dqfwzx/cpts/order.vue b/src/views/modules/communityService/dqfwzx/cpts/order.vue
index 58ac1bb4a..dfa12a86b 100644
--- a/src/views/modules/communityService/dqfwzx/cpts/order.vue
+++ b/src/views/modules/communityService/dqfwzx/cpts/order.vue
@@ -14,7 +14,7 @@
           <el-input class="item_width_1"
                     maxlength="50"
                     show-word-limit
-                    v-model="info.matterName"
+                    v-model.trim="info.matterName"
                     disabled>
           </el-input>
         </el-form-item>
@@ -24,13 +24,13 @@
                       label-width="150px"
                       style="display: block">
           <!-- <el-date-picker
-            v-model="dataForm.appointmentDate"
+            v-model.trim="dataForm.appointmentDate"
             placeholder="预约日期"
             value-format="yyyy-MM-dd"
             :picker-options="dateOptions"
           >
           </el-date-picker> -->
-          <el-select v-model="dataForm.appointmentDate"
+          <el-select v-model.trim="dataForm.appointmentDate"
                      placeholder="请选择">
             <el-option v-for="item in dateList"
                        :key="item"
@@ -65,7 +65,7 @@
                     maxlength="50"
                     show-word-limit
                     placeholder="请输入预约人"
-                    v-model="dataForm.appointmentName">
+                    v-model.trim="dataForm.appointmentName">
           </el-input>
         </el-form-item>
 
@@ -77,7 +77,7 @@
                     maxlength="50"
                     show-word-limit
                     placeholder="请输入联系方式"
-                    v-model="dataForm.appointmentPhone">
+                    v-model.trim="dataForm.appointmentPhone">
           </el-input>
         </el-form-item>
 
@@ -91,7 +91,7 @@
                     show-word-limit
                     :rows="3"
                     placeholder="请输入备注，不超过1000字"
-                    v-model="dataForm.remark"></el-input>
+                    v-model.trim="dataForm.remark"></el-input>
         </el-form-item>
       </el-form>
     </div>
diff --git a/src/views/modules/communityService/dqfwzx/cpts/orderList.vue b/src/views/modules/communityService/dqfwzx/cpts/orderList.vue
index 0153ff985..b8c05f9e0 100644
--- a/src/views/modules/communityService/dqfwzx/cpts/orderList.vue
+++ b/src/views/modules/communityService/dqfwzx/cpts/orderList.vue
@@ -7,7 +7,7 @@
                     prop="appointmentDate"
                     label-width="110px"
                     style="display: block">
-        <el-date-picker v-model="appointmentDate"
+        <el-date-picker v-model.trim="appointmentDate"
                         placeholder="预约日期"
                         value-format="yyyy-MM-dd">
         </el-date-picker>
diff --git a/src/views/modules/communityService/fuwujilu/addForm.vue b/src/views/modules/communityService/fuwujilu/addForm.vue
index 15897357a..0cf0d852a 100644
--- a/src/views/modules/communityService/fuwujilu/addForm.vue
+++ b/src/views/modules/communityService/fuwujilu/addForm.vue
@@ -13,7 +13,7 @@
                       label-width="150px"
                       :class="{ 'form-item': source === 'visiual' }"
                       style="display: block">
-          <el-select v-model="formData.serviceCategoryKey"
+          <el-select v-model.trim="formData.serviceCategoryKey"
                      class="item_width_1"
                      placeholder="请选择"
                      clearable>
@@ -31,7 +31,7 @@
                       style="display: block">
           <el-input class="item_width_1"
                     placeholder="请输入服务名称"
-                    v-model="formData.serviceName">
+                    v-model.trim="formData.serviceName">
           </el-input>
         </el-form-item>
 
@@ -40,7 +40,7 @@
                       label-width="150px"
                       :class="{ 'form-item': source === 'visiual' }"
                       style="display: block">
-          <el-select v-model="formData.serviceOrgType"
+          <el-select v-model.trim="formData.serviceOrgType"
                      class="input-width-small"
                      placeholder="请选择"
                      clearable
@@ -52,7 +52,7 @@
             </el-option>
           </el-select>
           -
-          <el-select v-model="formData.serviceOrgId"
+          <el-select v-model.trim="formData.serviceOrgId"
                      class="input-width-middle"
                      filterable
                      placeholder="请选择"
@@ -72,7 +72,7 @@
                       style="display: block">
           <el-cascader class="item_width_1"
                        ref="myCascader"
-                       v-model="scopeIdArray"
+                       v-model.trim="scopeIdArray"
                        :key="iscascaderShow"
                        :options="casOptions"
                        :props="optionProps"
@@ -85,7 +85,7 @@
                       label-width="150px"
                       :class="{ 'form-item': source === 'visiual' }"
                       style="display: block">
-          <el-select v-model="formData.policyId"
+          <el-select v-model.trim="formData.policyId"
                      class="input-width-small"
                      placeholder="请选择"
                      clearable>
@@ -109,7 +109,7 @@
                       style="display: block">
           <el-input class="item_width_1"
                     placeholder="请输入联系人姓名"
-                    v-model="formData.principalName">
+                    v-model.trim="formData.principalName">
           </el-input>
         </el-form-item>
         <el-form-item label="联系方式"
@@ -119,7 +119,7 @@
                       style="display: block">
           <el-input class="item_width_1"
                     placeholder="请输入联系人电话"
-                    v-model="formData.principalContact">
+                    v-model.trim="formData.principalContact">
           </el-input>
         </el-form-item>
 
@@ -127,7 +127,7 @@
                       label-width="150px"
                       :class="{ 'form-item': source === 'visiual' }"
                       prop="serviceTimeStart">
-          <el-date-picker v-model="formData.serviceTimeStart"
+          <el-date-picker v-model.trim="formData.serviceTimeStart"
                           :picker-options="startPickerOptions"
                           class="item_width_2"
                           style="width: 220px"
@@ -137,7 +137,7 @@
                           placeholder="开始时间">
           </el-date-picker>
           <span class="u-data-tag">至</span>
-          <el-date-picker v-model="formData.serviceTimeEnd"
+          <el-date-picker v-model.trim="formData.serviceTimeEnd"
                           :picker-options="endPickerOptions"
                           class="item_width_2 u-data-tag"
                           style="width: 220px"
@@ -159,7 +159,7 @@
                     show-word-limit
                     :rows="3"
                     placeholder="请输入备注，不超过1000字"
-                    v-model="formData.remark"></el-input>
+                    v-model.trim="formData.remark"></el-input>
         </el-form-item>
         <el-form-item label="直接反馈"
                       prop="remark"
@@ -167,7 +167,7 @@
                       :class="{ 'form-item': source === 'visiual' }"
                       style="display: block">
           <el-checkbox :label="'是'"
-                       v-model="showFeedback"
+                       v-model.trim="showFeedback"
                        @change="handleChangeFeedback"></el-checkbox>
         </el-form-item>
       </el-form>
@@ -190,7 +190,7 @@
                       show-word-limit
                       :rows="3"
                       placeholder="请输入服务目标，不超过1000字"
-                      v-model="feedbackFormData.serviceGoal"></el-input>
+                      v-model.trim="feedbackFormData.serviceGoal"></el-input>
           </el-form-item>
 
           <el-form-item label="服务效果"
@@ -204,7 +204,7 @@
                       show-word-limit
                       :rows="3"
                       placeholder="请输入服务效果，不超过1000字"
-                      v-model="feedbackFormData.serviceEffect"></el-input>
+                      v-model.trim="feedbackFormData.serviceEffect"></el-input>
           </el-form-item>
 
           <el-form-item label="服务人数"
@@ -213,7 +213,7 @@
                         prop="servicePeopleNumber"
                         label-width="150px">
             <el-input-number class="item_width_2"
-                             v-model="feedbackFormData.servicePeopleNumber"
+                             v-model.trim="feedbackFormData.servicePeopleNumber"
                              :min="0"
                              :max="9999"
                              label="服务人数"></el-input-number>
@@ -226,7 +226,7 @@
                         prop="serviceStatus">
             <span>已完成</span>
             <!-- <el-select class="item_width_1"
-                       v-model="feedbackFormData.serviceStatus"
+                       v-model.trim="feedbackFormData.serviceStatus"
                        placeholder="全部"
                        clearable>
               <el-option v-for="item in statusArray"
@@ -242,7 +242,7 @@
                         :class="{ 'form-item': source === 'visiual' }"
                         prop="satisfaction">
             <el-select class="item_width_2"
-                       v-model="feedbackFormData.satisfaction"
+                       v-model.trim="feedbackFormData.satisfaction"
                        placeholder="全部"
                        clearable>
               <el-option v-for="item in satisfyArray"
@@ -258,7 +258,7 @@
                         label-width="150px"
                         style="display: block">
             <el-input class="item_width_1"
-                      v-model="feedbackFormData.address"></el-input>
+                      v-model.trim="feedbackFormData.address"></el-input>
           </el-form-item>
           <el-form-item label="地图位置"
                         label-width="150px"
@@ -271,7 +271,7 @@
                   <el-input maxlength="50"
                             size="mini"
                             placeholder="请输入关键字"
-                            v-model="keyWords">
+                            v-model.trim="keyWords">
                   </el-input>
                   <el-button style="margin-left: 10px"
                              type="primary"
diff --git a/src/views/modules/communityService/fuwujilu/editForm.vue b/src/views/modules/communityService/fuwujilu/editForm.vue
index d27f72e9d..6f6754b4e 100644
--- a/src/views/modules/communityService/fuwujilu/editForm.vue
+++ b/src/views/modules/communityService/fuwujilu/editForm.vue
@@ -14,7 +14,7 @@
                       style="display: block">
           <span>{{formData.serviceName}}</span>
           <!-- <el-select class="item_width_1"
-                     v-model="formData.serviceProjectId"
+                     v-model.trim="formData.serviceProjectId"
                      placeholder="请选择"
                      filterable
                      clearable>
@@ -33,7 +33,7 @@
                       style="display: block">
           <span>{{serviceOrgName}}</span>
           <!-- <el-select class="item_width_1"
-                     v-model="formData.serviceOrgId"
+                     v-model.trim="formData.serviceOrgId"
                      placeholder="请选择"
                      filterable
                      clearable>
@@ -56,7 +56,7 @@
           </div>
           <!-- <el-cascader class="item_width_1"
                        ref="myCascader"
-                       v-model="scopeIdArray"
+                       v-model.trim="scopeIdArray"
                        :key="iscascaderShow"
                        :options="casOptions"
                        :props="optionProps"
@@ -69,7 +69,7 @@
                       label-width="150px"
                       style="display: block">
           <el-select :disabled="formType==='detail'"
-                     v-model="formData.policyId"
+                     v-model.trim="formData.policyId"
                      class="input-width-small"
                      placeholder="请选择"
                      clearable>
@@ -93,7 +93,7 @@
           <el-input :disabled="formType==='detail'"
                     class="item_width_1"
                     placeholder="请输入经办人姓名"
-                    v-model="formData.principalName">
+                    v-model.trim="formData.principalName">
           </el-input>
         </el-form-item>
         <el-form-item label="联系方式"
@@ -103,7 +103,7 @@
           <el-input :disabled="formType==='detail'"
                     class="item_width_1"
                     placeholder="请输入联系方式"
-                    v-model="formData.principalContact">
+                    v-model.trim="formData.principalContact">
           </el-input>
         </el-form-item>
 
@@ -111,7 +111,7 @@
                       label-width="150px"
                       prop="serviceTimeStart">
           <el-date-picker :disabled="formType==='detail'"
-                          v-model="formData.serviceTimeStart"
+                          v-model.trim="formData.serviceTimeStart"
                           :picker-options="startPickerOptions"
                           class="item_width_2"
                           type="date"
@@ -121,7 +121,7 @@
           </el-date-picker>
           <span class="u-data-tag">至</span>
           <el-date-picker :disabled="formType==='detail'"
-                          v-model="formData.serviceTimeEnd"
+                          v-model.trim="formData.serviceTimeEnd"
                           :picker-options="endPickerOptions"
                           class="item_width_2 u-data-tag"
                           type="date"
@@ -142,7 +142,7 @@
                     show-word-limit
                     :rows="3"
                     placeholder="请输入备注，不超过500字"
-                    v-model="formData.remark"></el-input>
+                    v-model.trim="formData.remark"></el-input>
         </el-form-item>
 
       </el-form>
@@ -166,7 +166,7 @@
                       show-word-limit
                       :rows="3"
                       placeholder="请输入服务目标，不超过1000字"
-                      v-model="feedbackFormData.serviceGoal"></el-input>
+                      v-model.trim="feedbackFormData.serviceGoal"></el-input>
           </el-form-item>
 
           <el-form-item label="服务效果"
@@ -179,7 +179,7 @@
                       show-word-limit
                       :rows="3"
                       placeholder="请输入服务效果，不超过1000字"
-                      v-model="feedbackFormData.serviceEffect"></el-input>
+                      v-model.trim="feedbackFormData.serviceEffect"></el-input>
           </el-form-item>
 
           <el-form-item label="服务人数"
@@ -187,7 +187,7 @@
                         prop="servicePeopleNumber"
                         label-width="150px">
             <el-input-number class="item_width_2"
-                             v-model="feedbackFormData.servicePeopleNumber"
+                             v-model.trim="feedbackFormData.servicePeopleNumber"
                              :min="0"
                              :max="9999"
                              label="服务人数"></el-input-number>
@@ -199,7 +199,7 @@
                         prop="serviceStatus">
             <span>已完成</span>
             <!-- <el-select class="item_width_1"
-                       v-model="feedbackFormData.serviceStatus"
+                       v-model.trim="feedbackFormData.serviceStatus"
                        placeholder="全部"
                        clearable>
               <el-option v-for="item in statusArray"
@@ -215,7 +215,7 @@
                         label-width="150px"
                         prop="satisfaction">
             <el-select class="item_width_2"
-                       v-model="feedbackFormData.satisfaction"
+                       v-model.trim="feedbackFormData.satisfaction"
                        placeholder="全部"
                        clearable>
               <el-option v-for="item in satisfyArray"
@@ -231,7 +231,7 @@
                         label-width="150px"
                         style="display: block">
             <el-input class="item_width_1"
-                      v-model="feedbackFormData.address"></el-input>
+                      v-model.trim="feedbackFormData.address"></el-input>
           </el-form-item>
           <!-- <el-form-item label="地图位置"
                         label-width="150px"
@@ -246,7 +246,7 @@
                   <el-input maxlength="50"
                             size="mini"
                             placeholder="请输入关键字"
-                            v-model="keyWords">
+                            v-model.trim="keyWords">
                   </el-input>
                   <el-button style="margin-left: 10px"
                              type="primary"
diff --git a/src/views/modules/communityService/fuwujilu/fuwuList.vue b/src/views/modules/communityService/fuwujilu/fuwuList.vue
index 18c9bff9b..e6b9c2025 100644
--- a/src/views/modules/communityService/fuwujilu/fuwuList.vue
+++ b/src/views/modules/communityService/fuwujilu/fuwuList.vue
@@ -10,7 +10,7 @@
 
             <el-form-item label="服务名称"
                           prop="serviceName">
-              <el-input v-model="formData.serviceName"
+              <el-input v-model.trim="formData.serviceName"
                         class="item_width_1"
                         size="small"
                         clearable
@@ -20,7 +20,7 @@
 
             <el-form-item label="服务组织"
                           prop="serviceOrgType">
-              <el-select v-model="formData.serviceOrgType"
+              <el-select v-model.trim="formData.serviceOrgType"
                          class="input-width-small"
                          placeholder="请选择"
                          clearable
@@ -32,7 +32,7 @@
                 </el-option>
               </el-select>
               -
-              <el-select v-model="formData.serviceOrgId"
+              <el-select v-model.trim="formData.serviceOrgId"
                          class="input-width-middle"
                          filterable
                          placeholder="请选择"
@@ -47,7 +47,7 @@
 
             <el-form-item label="服务时间"
                           prop="serviceTimeStart">
-              <el-date-picker v-model="formData.serviceTimeStart"
+              <el-date-picker v-model.trim="formData.serviceTimeStart"
                               :picker-options="startPickerOptions"
                               class="item_width_2"
                               size="small"
@@ -57,7 +57,7 @@
                               placeholder="开始时间">
               </el-date-picker>
               <span class="u-data-tag">至</span>
-              <el-date-picker v-model="formData.serviceTimeEnd"
+              <el-date-picker v-model.trim="formData.serviceTimeEnd"
                               :picker-options="endPickerOptions"
                               class="item_width_2 u-data-tag"
                               size="small"
@@ -71,7 +71,7 @@
             <el-form-item label="服务状态"
                           prop="serviceStatus">
               <el-select class="item_width_2"
-                         v-model="formData.serviceStatus"
+                         v-model.trim="formData.serviceStatus"
                          placeholder="全部"
                          size="small"
                          clearable>
@@ -86,7 +86,7 @@
             <el-form-item label="满意度"
                           prop="satisfaction">
               <el-select class="item_width_2"
-                         v-model="formData.satisfaction"
+                         v-model.trim="formData.satisfaction"
                          placeholder="全部"
                          size="small"
                          clearable>
diff --git a/src/views/modules/communityService/fuwujiluOld/addForm.vue b/src/views/modules/communityService/fuwujiluOld/addForm.vue
index 042161db5..6a674fb68 100644
--- a/src/views/modules/communityService/fuwujiluOld/addForm.vue
+++ b/src/views/modules/communityService/fuwujiluOld/addForm.vue
@@ -12,7 +12,7 @@
         <el-form-item label="服务分类"
                       label-width="150px"
                       prop="serviceCategoryKey">
-          <el-select v-model="formData.serviceCategoryKey"
+          <el-select v-model.trim="formData.serviceCategoryKey"
                      placeholder="请选择"
                      clearable
                      class="item_width_1">
@@ -30,7 +30,7 @@
                       label-width="150px"
                       style="display: block">
           <el-select class="item_width_1"
-                     v-model="formData.serviceProjectId"
+                     v-model.trim="formData.serviceProjectId"
                      placeholder="请选择"
                      filterable
                      clearable>
@@ -48,7 +48,7 @@
                       label-width="150px"
                       style="display: block">
           <el-select class="item_width_1"
-                     v-model="formData.serviceOrgId"
+                     v-model.trim="formData.serviceOrgId"
                      placeholder="请选择"
                      filterable
                      clearable>
@@ -67,7 +67,7 @@
                       style="display: block">
           <el-cascader class="item_width_1"
                        ref="myCascader"
-                       v-model="scopeIdArray"
+                       v-model.trim="scopeIdArray"
                        :key="iscascaderShow"
                        :options="casOptions"
                        :props="optionProps"
@@ -81,7 +81,7 @@
                       style="display: block">
           <el-input class="item_width_1"
                     placeholder="请输入联系人姓名"
-                    v-model="formData.principalName">
+                    v-model.trim="formData.principalName">
           </el-input>
         </el-form-item>
         <el-form-item label="联系方式"
@@ -90,14 +90,14 @@
                       style="display: block">
           <el-input class="item_width_1"
                     placeholder="请输入联系人电话"
-                    v-model="formData.principalContact">
+                    v-model.trim="formData.principalContact">
           </el-input>
         </el-form-item>
 
         <el-form-item label="服务时间"
                       label-width="150px"
                       prop="serviceTimeStart">
-          <el-date-picker v-model="formData.serviceTimeStart"
+          <el-date-picker v-model.trim="formData.serviceTimeStart"
                           :picker-options="startPickerOptions"
                           class="item_width_2"
                           type="date"
@@ -106,7 +106,7 @@
                           placeholder="开始时间">
           </el-date-picker>
           <span class="u-data-tag">至</span>
-          <el-date-picker v-model="formData.serviceTimeEnd"
+          <el-date-picker v-model.trim="formData.serviceTimeEnd"
                           :picker-options="endPickerOptions"
                           class="item_width_2 u-data-tag"
                           type="date"
@@ -126,14 +126,14 @@
                     show-word-limit
                     :rows="3"
                     placeholder="请输入备注，不超过1000字"
-                    v-model="formData.remark"></el-input>
+                    v-model.trim="formData.remark"></el-input>
         </el-form-item>
         <el-form-item label="直接反馈"
                       prop="remark"
                       label-width="150px"
                       style="display: block">
           <el-checkbox :label="'是'"
-                       v-model="showFeedback"
+                       v-model.trim="showFeedback"
                        @change="handleChangeFeedback"></el-checkbox>
         </el-form-item>
 
@@ -166,7 +166,7 @@
                       show-word-limit
                       :rows="3"
                       placeholder="请输入服务目标，不超过1000字"
-                      v-model="feedbackFormData.serviceGoal"></el-input>
+                      v-model.trim="feedbackFormData.serviceGoal"></el-input>
           </el-form-item>
 
           <el-form-item label="服务效果"
@@ -179,7 +179,7 @@
                       show-word-limit
                       :rows="3"
                       placeholder="请输入服务效果，不超过1000字"
-                      v-model="feedbackFormData.serviceEffect"></el-input>
+                      v-model.trim="feedbackFormData.serviceEffect"></el-input>
           </el-form-item>
 
           <el-form-item label="服务人数"
@@ -187,7 +187,7 @@
                         prop="servicePeopleNumber"
                         label-width="150px">
             <el-input-number class="item_width_1"
-                             v-model="feedbackFormData.servicePeopleNumber"
+                             v-model.trim="feedbackFormData.servicePeopleNumber"
                              :min="0"
                              :max="9999"
                              label="服务人数"></el-input-number>
@@ -198,7 +198,7 @@
                         prop="serviceStatus">
             <span>已完成</span>
             <!-- <el-select class="item_width_1"
-                       v-model="feedbackFormData.serviceStatus"
+                       v-model.trim="feedbackFormData.serviceStatus"
                        placeholder="全部"
                        clearable>
               <el-option v-for="item in statusArray"
@@ -213,7 +213,7 @@
                         label-width="150px"
                         prop="satisfaction">
             <el-select class="item_width_1"
-                       v-model="feedbackFormData.satisfaction"
+                       v-model.trim="feedbackFormData.satisfaction"
                        placeholder="全部"
                        clearable>
               <el-option v-for="item in satisfyArray"
@@ -229,7 +229,7 @@
                         label-width="150px"
                         style="display: block">
             <el-input class="item_width_1"
-                      v-model="feedbackFormData.address"></el-input>
+                      v-model.trim="feedbackFormData.address"></el-input>
           </el-form-item>
           <el-form-item label="地图位置"
                         label-width="150px"
@@ -244,7 +244,7 @@
                   <el-input maxlength="50"
                             size="mini"
                             placeholder="请输入关键字"
-                            v-model="keyWords">
+                            v-model.trim="keyWords">
                   </el-input>
                   <el-button style="margin-left: 10px"
                              type="primary"
diff --git a/src/views/modules/communityService/fuwujiluOld/detailForm.vue b/src/views/modules/communityService/fuwujiluOld/detailForm.vue
index a5f1fe42d..e0506b179 100644
--- a/src/views/modules/communityService/fuwujiluOld/detailForm.vue
+++ b/src/views/modules/communityService/fuwujiluOld/detailForm.vue
@@ -14,7 +14,7 @@
                       prop="serviceCategoryKey">
           <span>{{formData.serviceCategoryName}}</span>
 
-          <!-- <el-select v-model="formData.serviceCategoryKey"
+          <!-- <el-select v-model.trim="formData.serviceCategoryKey"
                      placeholder="请选择"
                      clearable
                      class="item_width_1">
@@ -33,7 +33,7 @@
                       style="display: block">
           <span>{{formData.serviceProjectName}}</span>
           <!-- <el-select class="item_width_1"
-                     v-model="formData.serviceProjectId"
+                     v-model.trim="formData.serviceProjectId"
                      placeholder="请选择"
                      filterable
                      clearable>
@@ -52,7 +52,7 @@
                       style="display: block">
           <span>{{formData.serviceOrgName}}</span>
           <!-- <el-select class="item_width_1"
-                     v-model="formData.serviceOrgId"
+                     v-model.trim="formData.serviceOrgId"
                      placeholder="请选择"
                      filterable
                      clearable>
@@ -75,7 +75,7 @@
           </div>
           <!-- <el-cascader class="item_width_1"
                        ref="myCascader"
-                       v-model="scopeIdArray"
+                       v-model.trim="scopeIdArray"
                        :key="iscascaderShow"
                        :options="casOptions"
                        :props="optionProps"
@@ -89,7 +89,7 @@
                       style="display: block">
           <el-input class="item_width_1"
                     placeholder="请输入联系人姓名"
-                    v-model="formData.principalName">
+                    v-model.trim="formData.principalName">
           </el-input>
         </el-form-item>
         <el-form-item label="联系方式"
@@ -98,14 +98,14 @@
                       style="display: block">
           <el-input class="item_width_1"
                     placeholder="请输入联系人电话"
-                    v-model="formData.principalContact">
+                    v-model.trim="formData.principalContact">
           </el-input>
         </el-form-item>
 
         <el-form-item label="服务时间"
                       label-width="150px"
                       prop="serviceTimeStart">
-          <el-date-picker v-model="formData.serviceTimeStart"
+          <el-date-picker v-model.trim="formData.serviceTimeStart"
                           :picker-options="startPickerOptions"
                           class="item_width_2"
                           type="date"
@@ -114,7 +114,7 @@
                           placeholder="开始时间">
           </el-date-picker>
           <span class="u-data-tag">至</span>
-          <el-date-picker v-model="formData.serviceTimeEnd"
+          <el-date-picker v-model.trim="formData.serviceTimeEnd"
                           :picker-options="endPickerOptions"
                           class="item_width_2 u-data-tag"
                           type="date"
@@ -134,7 +134,7 @@
                     show-word-limit
                     :rows="3"
                     placeholder="请输入备注，不超过500字"
-                    v-model="formData.remark"></el-input>
+                    v-model.trim="formData.remark"></el-input>
         </el-form-item>
 
       </el-form>
@@ -158,7 +158,7 @@
                       show-word-limit
                       :rows="3"
                       placeholder="请输入服务目标，不超过1000字"
-                      v-model="feedbackFormData.serviceGoal"></el-input>
+                      v-model.trim="feedbackFormData.serviceGoal"></el-input>
           </el-form-item>
 
           <el-form-item label="服务效果"
@@ -171,7 +171,7 @@
                       show-word-limit
                       :rows="3"
                       placeholder="请输入服务效果，不超过1000字"
-                      v-model="feedbackFormData.serviceEffect"></el-input>
+                      v-model.trim="feedbackFormData.serviceEffect"></el-input>
           </el-form-item>
 
           <el-form-item label="服务人数"
@@ -179,7 +179,7 @@
                         prop="servicePeopleNumber"
                         label-width="150px">
             <el-input-number class="item_width_1"
-                             v-model="feedbackFormData.servicePeopleNumber"
+                             v-model.trim="feedbackFormData.servicePeopleNumber"
                              :min="0"
                              :max="9999"
                              label="服务人数"></el-input-number>
@@ -190,7 +190,7 @@
                         prop="serviceStatus">
             <span>已完成</span>
             <!-- <el-select class="item_width_1"
-                       v-model="feedbackFormData.serviceStatus"
+                       v-model.trim="feedbackFormData.serviceStatus"
                        placeholder="全部"
                        clearable>
               <el-option v-for="item in statusArray"
@@ -205,7 +205,7 @@
                         label-width="150px"
                         prop="satisfaction">
             <el-select class="item_width_1"
-                       v-model="feedbackFormData.satisfaction"
+                       v-model.trim="feedbackFormData.satisfaction"
                        placeholder="全部"
                        clearable>
               <el-option v-for="item in satisfyArray"
@@ -221,7 +221,7 @@
                         label-width="150px"
                         style="display: block">
             <el-input class="item_width_1"
-                      v-model="feedbackFormData.address"></el-input>
+                      v-model.trim="feedbackFormData.address"></el-input>
           </el-form-item>
           <!-- <el-form-item label="地图位置"
                         label-width="150px"
@@ -236,7 +236,7 @@
                   <el-input maxlength="50"
                             size="mini"
                             placeholder="请输入关键字"
-                            v-model="keyWords">
+                            v-model.trim="keyWords">
                   </el-input>
                   <el-button style="margin-left: 10px"
                              type="primary"
diff --git a/src/views/modules/communityService/fuwujiluOld/fuwuList.vue b/src/views/modules/communityService/fuwujiluOld/fuwuList.vue
index f1580ca1b..258047636 100644
--- a/src/views/modules/communityService/fuwujiluOld/fuwuList.vue
+++ b/src/views/modules/communityService/fuwujiluOld/fuwuList.vue
@@ -10,7 +10,7 @@
 
             <el-form-item label="服务分类"
                           prop="serviceCategoryKey">
-              <el-select v-model="formData.serviceCategoryKey"
+              <el-select v-model.trim="formData.serviceCategoryKey"
                          placeholder="请选择"
                          size="small"
                          clearable
@@ -24,7 +24,7 @@
             </el-form-item>
             <el-form-item label="服务项目"
                           prop="serviceProjectName">
-              <el-input v-model="formData.serviceProjectName"
+              <el-input v-model.trim="formData.serviceProjectName"
                         class="item_width_1"
                         size="small"
                         clearable
@@ -34,7 +34,7 @@
 
             <el-form-item label="服务组织"
                           prop="serviceOrgName">
-              <el-input v-model="formData.serviceOrgName"
+              <el-input v-model.trim="formData.serviceOrgName"
                         class="item_width_2"
                         size="small"
                         clearable
@@ -44,7 +44,7 @@
 
             <el-form-item label="服务时间"
                           prop="serviceTimeStart">
-              <el-date-picker v-model="formData.serviceTimeStart"
+              <el-date-picker v-model.trim="formData.serviceTimeStart"
                               :picker-options="startPickerOptions"
                               class="item_width_2"
                               size="small"
@@ -54,7 +54,7 @@
                               placeholder="开始时间">
               </el-date-picker>
               <span class="u-data-tag">至</span>
-              <el-date-picker v-model="formData.serviceTimeEnd"
+              <el-date-picker v-model.trim="formData.serviceTimeEnd"
                               :picker-options="endPickerOptions"
                               class="item_width_2 u-data-tag"
                               size="small"
@@ -68,7 +68,7 @@
             <el-form-item label="服务状态"
                           prop="serviceStatus">
               <el-select class="item_width_2"
-                         v-model="formData.serviceStatus"
+                         v-model.trim="formData.serviceStatus"
                          placeholder="全部"
                          size="small"
                          clearable>
@@ -83,7 +83,7 @@
             <el-form-item label="满意度"
                           prop="satisfaction">
               <el-select class="item_width_2"
-                         v-model="formData.satisfaction"
+                         v-model.trim="formData.satisfaction"
                          placeholder="全部"
                          size="small"
                          clearable>
diff --git a/src/views/modules/communityService/fuwuxiangmu/cpts/edit.vue b/src/views/modules/communityService/fuwuxiangmu/cpts/edit.vue
index a66bd9c1b..9a1762faa 100644
--- a/src/views/modules/communityService/fuwuxiangmu/cpts/edit.vue
+++ b/src/views/modules/communityService/fuwuxiangmu/cpts/edit.vue
@@ -17,7 +17,7 @@
         >
           <el-select
             v-if="formType == 'add'"
-            v-model="fmData.serviceCategoryKey"
+            v-model.trim="fmData.serviceCategoryKey"
             placeholder="请选择"
             clearable
           >
@@ -44,7 +44,7 @@
             maxlength="100"
             show-word-limit
             placeholder="请输入项目名称"
-            v-model="fmData.serviceName"
+            v-model.trim="fmData.serviceName"
           >
           </el-input>
           <div style="width:610px" v-else>{{ fmData.serviceName || "--" }}</div>
@@ -64,7 +64,7 @@
             show-word-limit
             :rows="3"
             placeholder="请输入服务内容，不超过1000字"
-            v-model="fmData.serviceContent"
+            v-model.trim="fmData.serviceContent"
           ></el-input>
           <div style="width:610px" v-else>{{ fmData.serviceContent || "--" }}</div>
         </el-form-item>
@@ -77,7 +77,7 @@
         >
           <el-select
             v-if="formType == 'add' || formType == 'edit'"
-            v-model="fmData.policyLevel"
+            v-model.trim="fmData.policyLevel"
             placeholder="请选择"
             clearable
           >
@@ -106,7 +106,7 @@
             show-word-limit
             :rows="3"
             placeholder="请输入政策依据，不超过1000字"
-            v-model="fmData.policyGround"
+            v-model.trim="fmData.policyGround"
           ></el-input>
           <div style="width:610px" v-else>{{ fmData.policyGround || "--" }}</div>
         </el-form-item>
diff --git a/src/views/modules/communityService/fuwuxiangmu/index.vue b/src/views/modules/communityService/fuwuxiangmu/index.vue
index c829b2b84..3fa9e4b69 100644
--- a/src/views/modules/communityService/fuwuxiangmu/index.vue
+++ b/src/views/modules/communityService/fuwuxiangmu/index.vue
@@ -9,7 +9,7 @@
           <div>
             <el-form-item label="服务类别"
                           prop="serviceCategoryKey">
-              <el-select v-model="searchData.serviceCategoryKey"
+              <el-select v-model.trim="searchData.serviceCategoryKey"
                          placeholder="请选择"
                          size="small"
                          clearable
@@ -23,7 +23,7 @@
             </el-form-item>
             <el-form-item label="服务名称"
                           prop="serviceName">
-              <el-input v-model="searchData.serviceName"
+              <el-input v-model.trim="searchData.serviceName"
                         class="item_width_1"
                         size="small"
                         clearable
@@ -33,7 +33,7 @@
 
             <el-form-item label="服务内容"
                           prop="serviceContent">
-              <el-input v-model="searchData.serviceContent"
+              <el-input v-model.trim="searchData.serviceContent"
                         class="item_width_2"
                         size="small"
                         clearable
@@ -43,7 +43,7 @@
 
             <el-form-item label="政策依据"
                           prop="policyGround">
-              <el-input v-model="searchData.policyGround"
+              <el-input v-model.trim="searchData.policyGround"
                         class="item_width_2"
                         size="small"
                         clearable
diff --git a/src/views/modules/communityService/fuwuzhaoren/addForm.vue b/src/views/modules/communityService/fuwuzhaoren/addForm.vue
index c0cc0ad9e..59fabfb9c 100644
--- a/src/views/modules/communityService/fuwuzhaoren/addForm.vue
+++ b/src/views/modules/communityService/fuwuzhaoren/addForm.vue
@@ -1,224 +1,100 @@
 <template>
-  <div>
-    <div
-      class="dialog-h-content scroll-h"
-      :class="{ 'visiual-form': source === 'visiual' }"
-    >
-      <el-form
-        v-if="formType === 'add' || formType === 'edit'"
-        ref="ref_form"
-        :inline="true"
-        :model="formData"
-        :rules="dataRule"
-        class="div_form"
-      >
-      <el-form-item label="服务类别" prop="categoryCode" label-width="150px">
-          <el-cascader
-            v-model="formData.categoryCode"
-            :options="demandOptions"
-            :props="{label: 'categoryName',value: 'categoryCode',children: 'childCateList'}"
-            clearable
-            size="small"
-            class="u-item-width-normal"
-          ></el-cascader>
-          </el-form-item>
-        <el-form-item
-          label="服务事项"
-          prop="serviceName"
-          label-width="150px"
-          :class="{ 'form-item': source === 'visiual' }"
-          style="display: block"
-        >
-          <el-input
-            class="item_width_1"
-            placeholder="请输入服务事项"
-            v-model="formData.serviceName"
-          >
-          </el-input>
-        </el-form-item>
-
-        <el-form-item
-          label="服务内容"
-          prop="remark"
-          label-width="150px"
-          :class="{ 'form-item': source === 'visiual' }"
-          style="display: block"
-        >
-          <el-input
-            class="item_width_1"
-            type="textarea"
-            maxlength="1000"
-            show-word-limit
-            :rows="3"
-            placeholder="请输入备注，不超过1000字"
-            v-model="formData.remark"
-          ></el-input>
-        </el-form-item>
-        <el-form-item
-          label="查找享受服务人员"
-          prop="resiSearchTagId"
-          :class="{ 'form-item': source === 'visiual' }"
-          label-width="150px"
-          style="display: block"
-        >
-          <input
-            type="text"
-            v-model="formData.resiSearchTagId"
-            v-show="false"
-          />
-          <template
-            style="margin-right: 10px"
-            v-if="formData.resiSearchTagName"
-          >
-            <el-tag @close="handleCloseTag" closable style="margin-right: 10px">
-              {{ formData.resiSearchTagName }}
-            </el-tag>
-          </template>
-
-          <el-button type="primary" @click="handleClickLabel" size="mini">
-            <span> <i class="el-icon-plus"></i> 按标签查找 </span>
-          </el-button>
-        </el-form-item>
-        <el-form-item
-          label="服务组织"
-          prop="serviceOrgId"
-          label-width="150px"
-          :class="{ 'form-item': source === 'visiual' }"
-          style="display: block"
-        >
-          <el-select
-            v-model="formData.serviceOrgType"
-            class="input-width-small"
-            placeholder="请选择"
-            clearable
-            @change="handleServiceChange('add', $event)"
-          >
-            <el-option
-              v-for="item in serviceOptions"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"
-            >
-            </el-option>
-          </el-select>
-          -
-          <el-select
-            v-model="formData.serviceOrgId"
-            class="input-width-middle"
-            filterable
-            placeholder="请选择"
-            clearable
-          >
-            <el-option
-              v-for="item in serviceOptiondList"
-              :key="item.id"
-              :label="item.label"
-              :value="item.id"
-            >
-            </el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item
-          prop="noticeApproches"
-          label="自动通知服务组织"
-          label-width="150px"
-          style="display: block"
-        >
-          <el-checkbox-group v-model="formData.noticeApproches">
-            <el-checkbox label="sms" value="sms">短信通知</el-checkbox>
-            <el-checkbox label="wx_official_account" value="wx_official_account">微信公众号消息通知</el-checkbox>
-          </el-checkbox-group>
-        </el-form-item>
-        <el-form-item
-          label="服务范围"
-          prop="gridIdList"
-          label-width="150px"
-          :class="{ 'form-item': source === 'visiual' }"
-          style="display: block"
-        >
-          <el-cascader
-            class="item_width_1"
-            ref="myCascader"
-            v-model="scopeIdArray"
-            :key="iscascaderShow"
-            :options="casOptions"
-            :props="optionProps"
-            :show-all-levels="false"
-            collapse-tags
-            @change="handleChangeScope"
-          ></el-cascader>
-        </el-form-item>
-
-        <el-form-item
-          label="服务时间"
-          label-width="150px"
-          :class="{ 'form-item': source === 'visiual' }"
-          prop="serviceTimeStart"
-        >
-          <el-date-picker
-            v-model="formData.serviceTimeStart"
-            :picker-options="startPickerOptions"
-            class="item_width_2"
-            style="width: 220px"
-            type="date"
-            value-format="yyyy-MM-dd HH:mm:ss"
-            value="yyyy-MM-dd"
-            placeholder="开始时间"
-          >
-          </el-date-picker>
-          <span class="u-data-tag">至</span>
-          <el-date-picker
-            v-model="formData.serviceTimeEnd"
-            :picker-options="endPickerOptions"
-            class="item_width_2 u-data-tag"
-            style="width: 220px"
-            type="date"
-            value-format="yyyy-MM-dd HH:mm:ss"
-            value="yyyy-MM-dd"
-            placeholder="结束时间"
-          >
-          </el-date-picker>
-        </el-form-item>
-
-        <el-form-item
-          label="经办人"
-          prop="principalName"
-          :class="{ 'form-item': source === 'visiual' }"
-          label-width="150px"
-          style="display: block"
-        >
-          <el-input
-            class="item_width_1"
-            placeholder="请输入联系人姓名"
-            v-model="formData.principalName"
-          >
-          </el-input>
-        </el-form-item>
-        <el-form-item
-          label="联系方式"
-          prop="principalContact"
-          :class="{ 'form-item': source === 'visiual' }"
-          label-width="150px"
-          style="display: block"
-        >
-          <el-input
-            class="item_width_1"
-            placeholder="请输入联系人电话"
-            v-model="formData.principalContact"
-          >
-          </el-input>
-        </el-form-item>
-        <el-form-item
-            label="上传图片"
-            label-width="150px"
-            style="display: block"
-            prop="attachments"
-            v-if="formType === 'edit'"
-        >
-          <UploadImages :fileList="formData.attachments" @change="(val) => formData.attachments = val"/>
-        </el-form-item>
-
-        <!-- <el-form-item
+    <div>
+        <div class="dialog-h-content scroll-h" :class="{ 'visiual-form': source === 'visiual' }">
+            <el-form v-if="formType === 'add' || formType === 'edit'" ref="ref_form" :inline="true" :model="formData"
+                :rules="dataRule" class="div_form">
+                <el-form-item label="服务类别" prop="categoryCode" label-width="150px">
+                    <el-cascader v-model.trim="formData.categoryCode" :options="demandOptions"
+                        :props="{ label: 'categoryName', value: 'categoryCode', children: 'childCateList' }" clearable
+                        size="small" class="u-item-width-normal"></el-cascader>
+                </el-form-item>
+                <el-form-item label="服务事项" prop="serviceName" label-width="150px"
+                    :class="{ 'form-item': source === 'visiual' }" style="display: block">
+                    <el-input class="item_width_1" placeholder="请输入服务事项" v-model.trim="formData.serviceName">
+                    </el-input>
+                </el-form-item>
+
+                <el-form-item label="服务内容" prop="remark" label-width="150px" :class="{ 'form-item': source === 'visiual' }"
+                    style="display: block">
+                    <el-input class="item_width_1" type="textarea" maxlength="1000" show-word-limit :rows="3"
+                        placeholder="请输入备注，不超过1000字" v-model.trim="formData.remark"></el-input>
+                </el-form-item>
+                <el-form-item label="查找享受服务人员" prop="resiSearchTagId" :class="{ 'form-item': source === 'visiual' }"
+                    label-width="150px" style="display: block">
+                    <input type="text" v-model.trim="formData.resiSearchTagId" v-show="false" />
+                    <template style="margin-right: 10px" v-if="formData.resiSearchTagName">
+                        <el-tag @close="handleCloseTag" closable style="margin-right: 10px">
+                            {{ formData.resiSearchTagName }}
+                        </el-tag>
+                    </template>
+
+                    <el-button type="primary" @click="handleClickLabel" size="mini">
+                        <span> <i class="el-icon-plus"></i> 按标签查找 </span>
+                    </el-button>
+                </el-form-item>
+                <el-form-item label="服务组织" prop="serviceOrgId" label-width="150px"
+                    :class="{ 'form-item': source === 'visiual' }" style="display: block">
+                    <el-select v-model.trim="formData.serviceOrgType" class="input-width-small" placeholder="请选择" clearable
+                        @change="handleServiceChange('add', $event)">
+                        <el-option v-for="item in serviceOptions" :key="item.value" :label="item.label" :value="item.value">
+                        </el-option>
+                    </el-select>
+                    -
+                    <el-select v-model.trim="formData.serviceOrgId" class="input-width-middle" filterable placeholder="请选择"
+                        clearable>
+                        <el-option v-for="item in serviceOptiondList" :key="item.id" :label="item.label" :value="item.id">
+                        </el-option>
+                    </el-select>
+                </el-form-item>
+                <el-form-item prop="noticeApproches" label="自动通知服务组织" label-width="150px" style="display: block">
+                    <el-checkbox-group v-model.trim="formData.noticeApproches">
+                        <el-checkbox label="sms" value="sms">短信通知</el-checkbox>
+                        <el-checkbox label="wx_official_account" value="wx_official_account">微信公众号消息通知</el-checkbox>
+                    </el-checkbox-group>
+                </el-form-item>
+                <el-form-item label="服务范围" prop="gridIdList" label-width="150px"
+                    :class="{ 'form-item': source === 'visiual' }" style="display: block">
+                    <el-cascader class="item_width_1" ref="myCascader" v-model.trim="scopeIdArray" :key="iscascaderShow"
+                        :options="casOptions" :props="optionProps" :show-all-levels="false" collapse-tags
+                        @change="handleChangeScope"></el-cascader>
+                </el-form-item>
+
+                <el-form-item label="服务时间" label-width="150px" :class="{ 'form-item': source === 'visiual' }"
+                    prop="serviceTimeStart">
+                    <el-date-picker v-model.trim="formData.serviceTimeStart" :picker-options="startPickerOptions"
+                        class="item_width_2" style="width: 220px" type="date" value-format="yyyy-MM-dd HH:mm:ss"
+                        value="yyyy-MM-dd" placeholder="开始时间">
+                    </el-date-picker>
+                    <span class="u-data-tag">至</span>
+                    <el-date-picker v-model.trim="formData.serviceTimeEnd" :picker-options="endPickerOptions"
+                        class="item_width_2 u-data-tag" style="width: 220px" type="date" value-format="yyyy-MM-dd HH:mm:ss"
+                        value="yyyy-MM-dd" placeholder="结束时间">
+                    </el-date-picker>
+                </el-form-item>
+
+                <el-form-item label="经办人" prop="principalName" :class="{ 'form-item': source === 'visiual' }"
+                    label-width="150px" style="display: block">
+                    <el-input class="item_width_1" placeholder="请输入联系人姓名" v-model.trim="formData.principalName">
+                    </el-input>
+                </el-form-item>
+                <el-form-item label="联系方式" prop="principalContact" :class="{ 'form-item': source === 'visiual' }"
+                    label-width="150px" style="display: block">
+                    <el-input class="item_width_1" placeholder="请输入联系人电话" v-model.trim="formData.principalContact">
+                    </el-input>
+                </el-form-item>
+                <el-form-item label="服务状态" prop="serviceStatus" :class="{ 'form-item': source === 'visiual' }"
+                    label-width="150px" style="display: block">
+                    <el-select v-model.trim="formData.serviceStatus" placeholder="请选择">
+                        <el-option v-for="e in serviceStatusOptions" :key="e.value" :value="e.value"
+                            :label="e.label"></el-option>
+                    </el-select>
+                </el-form-item>
+                <el-form-item label="上传图片" label-width="150px" style="display: block" prop="attachments"
+                    v-if="formType === 'edit'">
+                    <UploadImages :fileList="formData.attachments" @change="(val) => formData.attachments = val" />
+                </el-form-item>
+
+                <!-- <el-form-item
           label="直接反馈"
           prop="remark"
           label-width="150px"
@@ -227,100 +103,50 @@
         >
           <el-checkbox
             :label="'是'"
-            v-model="showFeedback"
+            v-model.trim="showFeedback"
             @change="handleChangeFeedback"
           ></el-checkbox>
         </el-form-item> -->
-      </el-form>
-      <div v-show="formType === 'feedback' || showFeedback">
-        <!-- <h3 class="d-h3">反馈内容</h3> -->
-
-        <el-form
-          ref="ref_form_feedback"
-          :inline="true"
-          :model="feedbackFormData"
-          :rules="feedbackDataRule"
-          class="div_form"
-        >
-          <el-form-item
-            label="满意度"
-            style="display: block"
-            label-width="150px"
-            :class="{ 'form-item': source === 'visiual' }"
-            prop="satisfaction"
-          >
-            <el-select
-              class="item_width_2"
-              v-model="feedbackFormData.satisfaction"
-              placeholder="全部"
-              clearable
-            >
-              <el-option
-                v-for="item in satisfyArray"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-              >
-              </el-option>
-            </el-select>
-          </el-form-item>
-          <el-form-item
-            label="备注"
-            prop="serviceGoal"
-            :class="{ 'form-item': source === 'visiual' }"
-            label-width="150px"
-            style="display: block"
-          >
-            <el-input
-              class="item_width_1"
-              type="textarea"
-              maxlength="1000"
-              show-word-limit
-              :rows="3"
-              v-model="feedbackFormData.serviceGoal"
-            ></el-input>
-          </el-form-item>
-        </el-form>
-      </div>
-    </div>
-
-    <div class="div_btn">
-      <el-button size="small" @click="handleCancle">取 消</el-button>
-      <el-button
-        size="small"
-        type="primary"
-        :disabled="btnDisable"
-        @click="handleComfirm"
-        >确 定</el-button
-      >
-    </div>
-
-    <el-dialog
-      v-if="showLabelForm"
-      :visible.sync="showLabelForm"
-      :append-to-body="true"
-      :close-on-click-modal="false"
-      :close-on-press-escape="false"
-      :title="'标签配置'"
-      width="954px"
-      top="5vh"
-      class="dialog-h"
-      @closed="showLabelForm = false"
-    >
-      <label-form
-        ref="ref_label_form"
-        :ruleList="ruleList"
-        @dialogCancle="addFormCancle"
-        @dialogOk="addFormOk"
-      >
-        <!--    @handleOk="handleOk"
+            </el-form>
+            <div v-show="formType === 'feedback' || showFeedback">
+                <!-- <h3 class="d-h3">反馈内容</h3> -->
+
+                <el-form ref="ref_form_feedback" :inline="true" :model="feedbackFormData" :rules="feedbackDataRule"
+                    class="div_form">
+                    <el-form-item label="满意度" style="display: block" label-width="150px"
+                        :class="{ 'form-item': source === 'visiual' }" prop="satisfaction">
+                        <el-select class="item_width_2" v-model.trim="feedbackFormData.satisfaction" placeholder="全部" clearable>
+                            <el-option v-for="item in satisfyArray" :key="item.value" :label="item.label"
+                                :value="item.value">
+                            </el-option>
+                        </el-select>
+                    </el-form-item>
+                    <el-form-item label="备注" prop="serviceGoal" :class="{ 'form-item': source === 'visiual' }"
+                        label-width="150px" style="display: block">
+                        <el-input class="item_width_1" type="textarea" maxlength="1000" show-word-limit :rows="3"
+                            v-model.trim="feedbackFormData.serviceGoal"></el-input>
+                    </el-form-item>
+                </el-form>
+            </div>
+        </div>
+
+        <div class="div_btn">
+            <el-button size="small" @click="handleCancle">取 消</el-button>
+            <el-button size="small" type="primary" :disabled="btnDisable" @click="handleComfirm">确 定</el-button>
+        </div>
+
+        <el-dialog v-if="showLabelForm" :visible.sync="showLabelForm" :append-to-body="true" :close-on-click-modal="false"
+            :close-on-press-escape="false" :title="'标签配置'" width="954px" top="5vh" class="dialog-h"
+            @closed="showLabelForm = false">
+            <label-form ref="ref_label_form" :ruleList="ruleList" @dialogCancle="addFormCancle" @dialogOk="addFormOk">
+                <!--    @handleOk="handleOk"
           @handleClose="handleClose" -->
-      </label-form>
-    </el-dialog>
-  </div>
+            </label-form>
+        </el-dialog>
+    </div>
 </template>
   
-    <script>
+<script>
 import { mapGetters } from "vuex";
 import { Loading } from "element-ui"; // 引入Loading服务
 import { requestPost, requestGet } from "@/js/dai/request";
@@ -334,712 +160,715 @@ let loading; // 加载动画
 let map;
 
 export default {
-  props: {
-    defaultData: {
-      type: Object,
-      default: null,
-    },
-    serviceRecordId: {
-      type: String,
-      required: "",
-    },
-    serviceProjectName: {
-      //服务项目名称
-      type: String,
-      required: false,
-      default: "",
-    },
-    formType: {
-      //表单操作类型 add新增，edit编辑，detail详情,feedback反馈
-      type: String,
-      required: "",
-    },
-    categrayArray: {
-      type: Array,
-      default() {
-        return [];
-      },
-    },
-    source: {
-      //展示来源：manage  管理平台    visiual  可视化平台
-      type: String,
-      default: "manage",
-    },
-  },
-
-  data() {
-    let endDisabledDate = (time) => {
-      //这个关键属性我们一定要写在data的里面并且return的外面，这是动态改变区间的关键
-      let nowData = Date.now();
-      if (this.formData.serviceTimeStart) {
-        let serviceTimeStart = new Date(this.formData.serviceTimeStart);
-        return (
-          time.getTime() < serviceTimeStart- 24 * 60 * 60 * 1000 ||
-          time.getTime() === serviceTimeStart- 24 * 60 * 60 * 1000
-        );
-      } else {
-        return (time.getTime() > nowData || time.getTime() === nowData) ;
-      }
-    };
-    let startDisabledDate = (time) => {
-      //这个关键属性我们一定要写在data的里面并且return的外面，这是动态改变区间的关键
-      let nowData = Date.now() - 24 * 60 * 60 * 1000;
-      return time.getTime() < nowData;
-    };
-    return {
-      btnDisable: false,
-      casOptions: [],
-      scopeIdArray: [],
-      iscascaderShow: 0,
-
-      optionProps: {
-        multiple: true,
-        value: "objectId",
-        label: "objectName",
-        children: "children",
-        checkStrictly: true,
-        emitPath: false,
-      },
-
-      keyWords: "",
-      formData: {
-        categoryCode:[],
-        parentCategoryCode:'',
-        resiSearchTagId: "", //查找享受服务人员
-        resiSearchTagName: "", //享受服务人员名称
-        serviceName: "", //服务事项
-        noticeApproches: [], //通知服务组织
-        policyId: "", //政策依据
-        serviceOrgType: "", //服务组织类型 社区自组织：community_org， 志愿者：ic_user_volunteer， 联建单位：party_unit
-        serviceOrgId: "", //服务组织Id
-        gridIdList: [], //
-        principalName: "", //经办人(责任人)姓名
-        principalContact: "", //经办人联系方式
-        serviceTimeStart: "", //服务起始时间yyyy-MM-dd
-        serviceTimeEnd: "", //服务截止时间yyyy-MM-dd
-        remark: "", //
-        attachments: []
-      },
-      feedbackFormData: {
-        serviceGoal: "", //	服务目标
-        serviceEffect: "", //	服务效果
-        servicePeopleNumber: null, //	服务人数
-        serviceStatus: "completed", //	服务状态。in_service服务中；completed:已完成
-        satisfaction: "", //满意度。不满意:bad、基本满意:good、非常满意:perfect
-        longitude: "", //	经度
-        latitude: "", //	维度
-        address: "",
-        fileList: [], //	附件列表
-      },
-      sarr: [],
-      dataRule: {
-        categoryCode: [
-          { required: true, message: "服务类别不能为空", trigger: "change" },
-        ],
-        serviceName: [
-          { required: true, message: "服务事项不能为空", trigger: "change" },
-        ],
-        serviceOrgId: [
-          { required: true, message: "服务组织不能为空", trigger: "change" },
-        ],
-
-        serviceTimeStart: [
-          { required: true, message: "服务时间不能为空", trigger: "change" },
-        ],
-        gridIdList: [
-          { required: true, message: "服务范围不能为空", trigger: "change" },
-        ],
-        resiSearchTagId: [
-          { required: true, message: "享受服务人员不能为空", trigger: "blur" },
-        ],
-      },
-
-      endPickerOptions: {
-        disabledDate: endDisabledDate,
-      },
-      startPickerOptions: {
-        disabledDate: startDisabledDate,
-      },
-
-      serviceOptions: [],
-      serviceOptiondList: [],
-      policyList: [],
-
-      fileList: [],
-      uploadUlr: window.SITE_CONFIG["apiURL"] + "/oss/file/uploadvariedfile",
-
-      showPersonList: false,
-      ruleList: [],
-      firstInitMap: true,
-
-      categrayOptions: [],
-      statusArray: [
-        {
-          value: "in_service",
-          label: "进行中",
+    props: {
+        defaultData: {
+            type: Object,
+            default: null,
         },
-        {
-          value: "completed",
-          label: "已完成",
+        serviceRecordId: {
+            type: String,
+            required: "",
         },
-      ],
-      satisfyArray: [
-        {
-          value: "bad",
-          label: "不满意",
+        serviceProjectName: {
+            //服务项目名称
+            type: String,
+            required: false,
+            default: "",
         },
-        {
-          value: "good",
-          label: "基本满意",
+        formType: {
+            //表单操作类型 add新增，edit编辑，detail详情,feedback反馈
+            type: String,
+            required: "",
         },
-        {
-          value: "perfect",
-          label: "非常满意",
+        categrayArray: {
+            type: Array,
+            default() {
+                return [];
+            },
+        },
+        source: {
+            //展示来源：manage  管理平台    visiual  可视化平台
+            type: String,
+            default: "manage",
         },
-      ],
-      showLabelForm: false,
-      showFeedback: false,
-      demandOptions:[]
-    };
-  },
-
-  computed: {
-    feedbackDataRule() {
-      return {
-        serviceEffect: [
-          { required: true, message: "服务效果不能为空", trigger: "blur" },
-        ],
-        servicePeopleNumber: [
-          { required: true, message: "服务人数不能为空", trigger: "blur" },
-        ],
-        serviceStatus: [
-          { required: true, message: "服务状态不能为空", trigger: "blur" },
-        ],
-        satisfaction: [
-          { required: true, message: "满意度不能为空", trigger: "blur" },
-        ],
-        address: [{ required: true, message: "地址不能为空", trigger: "blur" }],
-      };
-    },
-  },
-
-  watch: {
-    "formData.serviceTimeEnd": function (val) {
-      if (val && val != "") {
-        let arrayTemp = val.split(" ");
-        this.formData.serviceTimeEnd = arrayTemp[0] + " 23:59:59";
-      }
-    },
-  },
-
-  components: { labelForm,UploadImages },
-
-  async mounted() {
-    this.startLoading();
-    // 都已经重置了，还放在prop里干嘛，我不理解
-    this.categrayOptions = this.categrayArray;
-
-    // this.getCategrayList();
-    this.getDictOptions();
-    this.getPolicyList();
-    await this.loadScopeTree();
-    if (this.formType === "add") {
-      this.$refs.ref_form.resetFields();
-    } else if (this.formType == "edit") {
-     await this.loadInfo();
-    }
-    await this.getDemandOptions()
-    await this.iniDefaultData();
-
-    this.endLoading();
-    // 服务分类下拉（其实是获取的共性服务分类）
-  },
-
-  methods: {
-    handelDisabledRules(v) {
-      if (!v) {
-        delete this.dataRule.resiSearchTagId;
-      } else {
-        var arr = [
-          {
-            required: true,
-            message: "享受服务人员不能为空",
-            trigger: "change",
-          },
-        ];
-        this.dataRule.resiSearchTagId = arr;
-      }
-      console.log(this.dataRule);
-    },
-    async getDemandOptions() {
-      this.$http
-        .post("/actual/base/serviceitem/listAllCategory")
-        .then(({ data: res }) => {
-          if (res.code !== 0) {
-            return this.$message.error(res.msg);
-          } else {
-            this.demandOptions = this.getFlagData(
-              this.getTreeData(res.data),
-              "usableFlag"
-            ).filter((item) => item.categoryCode == '1038' ||item.categoryCode == '1039'||item.categoryCode == '1041');
-          }
-        })
-        .catch(() => {
-          return this.$message.error("网络错误");
-        });
-    },
-    getFlagData(data, flag) {
-      if (!Array.isArray(data)) return [];
-      let arr1 = data.filter((item) => item[flag]);
-      let arr2 = arr1.map((item) => {
-        if (item.childCateList)
-          return { ...item, childCateList: this.getFlagData(item.childCateList, flag) };
-        else return item;
-      });
-      // console.log('arrr-oppp', arr2)
-      return arr2;
-    },
-    getTreeData(data) {
-      if (!Array.isArray(data)) return [];
-      let arr = data.map((item) => {
-        let _item = {};
-        if (item.childCateList) {
-          if (item.childCateList.length === 0)
-            _item = { ...item, childCateList: undefined };
-          else _item = { ...item, childCateList: this.getTreeData(item.childCateList) };
-        } else {
-          _item = { ...item };
-        }
-        return _item;
-      });
-      return arr;
-    },
-    //获取服务详情数据
-    async loadInfo() {
-      const url = "/governance/icServiceRecordV2/detail";
-      let params = {
-        serviceRecordId: this.serviceRecordId,
-      };
-
-      const { data, code, msg } = await requestPost(url, params);
-
-      if (code === 0) {
-        this.formData = { ...data };
-        if (data.categoryCode) {
-          this.formData.categoryCode = [data.parentCategoryCode, data.categoryCode];
-        } else {
-          this.formData.categoryCode = [data.parentCategoryCode];
-        }
-        if(!data.noticeApproches){
-          this.formData.noticeApproches = [];
-        }
-        this.scopeIdArray = data.gridIdList.map(i => i.objectId);
-        this.feedbackFormData = { ...data.feedback };
-        await this.getServiceuserList(this.formData.serviceOrgType);
-        await this.getTagName();
-        // this.fileList = []
-        // if (data.feedback && data.feedback.fileList && data.feedback.fileList.length > 0) {
-        //   data.feedback.fileList.forEach(element => {
-        //     let obj = {
-        //       name: element.name,
-        //       format: element.format,
-        //       url: element.url,
-        //     }
-        //     this.fileList.push(obj)
-        //   });
-        // }
-      } else {
-        this.$message.error(msg);
-      }
-    },
-    async getTagName() {
-      const url = "/governance/resiSearchTag/listResiSearchTags";
-      let params = {
-        pageSize: 99,
-      };
-      let { data, msg, code } = await requestPost(url, params);
-      if (code == 0) {
-        let showAddProduct = data.list.filter((item) => {
-          return [this.formData.resiSearchTagId].includes(item.tagId);
-        });
-        this.formData.resiSearchTagName = showAddProduct[0].tagName;
-      } else {
-        this.$message.error(msg);
-      }
-    },
-    handleClickLabel() {
-      this.showLabelForm = true;
-      this.$nextTick(() => {
-        this.$refs["ref_label_form"].initForm("info");
-      });
-    },
-    addFormOk(val) {
-      this.showLabelForm = false;
-      this.formData.resiSearchTagId = val.tagId;
-      this.formData.resiSearchTagName = val.tagName;
-    },
-    addFormCancle() {
-      this.showLabelForm = false;
-    },
-    handleCloseTag() {
-      this.formData.resiSearchTagId = "";
-      this.formData.resiSearchTagName = "";
-    },
-    getLastItem(list, vals, key) {
-      let LIST = list || [];
-      for (let item of LIST) {
-        for (let i of vals) {
-          if (item[key] === i) {
-            this.sarr.push(item);
-          } else if (item["objectType"] == "district") {
-            this.getLastItem(item.children, vals, key);
-          } else {
-            this.getLastItem(item.children, vals, key);
-          }
-        }
-      }
-    },
-    async handleTreeList() {
-      const map = new Map();
-      await this.getLastItem(this.casOptions, this.scopeIdArray, "objectId");
-      let temp = [];
-      //递归出的数据会有重复,因为一个街道下面有两个社区的话就会循环push两遍,在这里去重
-      temp = this.sarr.filter(
-        (v) => !map.has(v.objectId) && map.set(v.objectId, 1)
-      );
-      for (let i in temp) {
-        this.scopeIdArray.push({
-          objectId: temp[i].objectId,
-          objectType: temp[i].objectType,
-          objectName: temp[i].objectName,
-        });
-      }
-      temp = [];
-      //  如果是编辑的话回填的数据会有数组字符串需要将不是对象属性的过滤掉
-      let arr = [];
-      // let isOk = false;
-      this.scopeIdArray.forEach((item) => {
-        if (typeof item != "string") {
-          arr.push(item);
-        }
-      });
-      return arr;
-    },
-    handleChangeFeedback(val) {
-      this.showFeedback = val;
-
-      // if (this.firstInitMap) {
-      //   this.$nextTick(() => {
-      //     this.initMap();
-      //   });
-      // }
-    },
-    async iniDefaultData() {
-      const { defaultData } = this;
-      if (defaultData) {
-        const { serviceOrgType, serviceOrgId, scopeIdArray } = defaultData;
-        if (serviceOrgType) {
-          this.formData.serviceOrgType = serviceOrgType;
-          await this.getServiceuserList(serviceOrgType, "add_demand");
-        }
-        if (serviceOrgId) {
-          this.formData.serviceOrgId = serviceOrgId;
-        }
-        if (scopeIdArray) {
-          this.scopeIdArray = scopeIdArray;
-          await nextTick();
-          this.handleChangeScope();
-        }
-      }
     },
 
-    handleClose() {
-      this.showPersonList = false;
-    },
-    handleOk() {
-      this.showPersonList = false;
+    data() {
+        let endDisabledDate = (time) => {
+            //这个关键属性我们一定要写在data的里面并且return的外面，这是动态改变区间的关键
+            let nowData = Date.now();
+            if (this.formData.serviceTimeStart) {
+                let serviceTimeStart = new Date(this.formData.serviceTimeStart);
+                return (
+                    time.getTime() < serviceTimeStart - 24 * 60 * 60 * 1000 ||
+                    time.getTime() === serviceTimeStart - 24 * 60 * 60 * 1000
+                );
+            } else {
+                return (time.getTime() > nowData || time.getTime() === nowData);
+            }
+        };
+        let startDisabledDate = (time) => {
+            //这个关键属性我们一定要写在data的里面并且return的外面，这是动态改变区间的关键
+            let nowData = Date.now() - 24 * 60 * 60 * 1000;
+            return time.getTime() < nowData;
+        };
+        return {
+            btnDisable: false,
+            casOptions: [],
+            scopeIdArray: [],
+            iscascaderShow: 0,
+
+            optionProps: {
+                multiple: true,
+                value: "objectId",
+                label: "objectName",
+                children: "children",
+                checkStrictly: true,
+                emitPath: false,
+            },
+            serviceStatusOptions: [{ 'label': '进行中', 'value': 'in_service' }, { 'label': '已完成', 'value': 'completed' }, { 'label': '取消', 'value': 'cancel' }],
+            keyWords: "",
+            formData: {
+                categoryCode: [],
+                parentCategoryCode: '',
+                resiSearchTagId: "", //查找享受服务人员
+                resiSearchTagName: "", //享受服务人员名称
+                serviceName: "", //服务事项
+                noticeApproches: [], //通知服务组织
+                policyId: "", //政策依据
+                serviceOrgType: "", //服务组织类型 社区自组织：community_org， 志愿者：ic_user_volunteer， 联建单位：party_unit
+                serviceOrgId: "", //服务组织Id
+                gridIdList: [], //
+                principalName: "", //经办人(责任人)姓名
+                principalContact: "", //经办人联系方式
+                serviceTimeStart: "", //服务起始时间yyyy-MM-dd
+                serviceTimeEnd: "", //服务截止时间yyyy-MM-dd
+                serviceStatus: "", //服务状态 in_service服务中；completed:已完成；cancel：取消
+                remark: "", //
+                attachments: []
+            },
+            feedbackFormData: {
+                serviceGoal: "", //	服务目标
+                serviceEffect: "", //	服务效果
+                servicePeopleNumber: null, //	服务人数
+                serviceStatus: "completed", //	服务状态。in_service服务中；completed:已完成
+                satisfaction: "", //满意度。不满意:bad、基本满意:good、非常满意:perfect
+                longitude: "", //	经度
+                latitude: "", //	维度
+                address: "",
+                fileList: [], //	附件列表
+            },
+            sarr: [],
+            dataRule: {
+                categoryCode: [
+                    { required: true, message: "服务类别不能为空", trigger: "change" },
+                ],
+                serviceName: [
+                    { required: true, message: "服务事项不能为空", trigger: "change" },
+                ],
+                serviceOrgId: [
+                    { required: true, message: "服务组织不能为空", trigger: "change" },
+                ],
+
+                serviceTimeStart: [
+                    { required: true, message: "服务时间不能为空", trigger: "change" },
+                ],
+                gridIdList: [
+                    { required: true, message: "服务范围不能为空", trigger: "change" },
+                ],
+                resiSearchTagId: [
+                    { required: true, message: "享受服务人员不能为空", trigger: "blur" },
+                ],
+            },
+
+            endPickerOptions: {
+                disabledDate: endDisabledDate,
+            },
+            startPickerOptions: {
+                disabledDate: startDisabledDate,
+            },
+
+            serviceOptions: [],
+            serviceOptiondList: [],
+            policyList: [],
+
+            fileList: [],
+            uploadUlr: window.SITE_CONFIG["apiURL"] + "/oss/file/uploadvariedfile",
+
+            showPersonList: false,
+            ruleList: [],
+            firstInitMap: true,
+
+            categrayOptions: [],
+            statusArray: [
+                {
+                    value: "in_service",
+                    label: "进行中",
+                },
+                {
+                    value: "completed",
+                    label: "已完成",
+                },
+            ],
+            satisfyArray: [
+                {
+                    value: "bad",
+                    label: "不满意",
+                },
+                {
+                    value: "good",
+                    label: "基本满意",
+                },
+                {
+                    value: "perfect",
+                    label: "非常满意",
+                },
+            ],
+            showLabelForm: false,
+            showFeedback: false,
+            demandOptions: []
+        };
     },
 
-    async getPolicyList() {
-      const url = "/governance/policy/policyList";
-
-      let params = {};
-
-      const { data, code, msg } = await requestPost(url, params);
-
-      if (code === 0) {
-        this.policyList = data;
-      } else {
-        this.$message.error(msg);
-      }
+    computed: {
+        feedbackDataRule() {
+            return {
+                serviceEffect: [
+                    { required: true, message: "服务效果不能为空", trigger: "blur" },
+                ],
+                servicePeopleNumber: [
+                    { required: true, message: "服务人数不能为空", trigger: "blur" },
+                ],
+                serviceStatus: [
+                    { required: true, message: "服务状态不能为空", trigger: "blur" },
+                ],
+                satisfaction: [
+                    { required: true, message: "满意度不能为空", trigger: "blur" },
+                ],
+                address: [{ required: true, message: "地址不能为空", trigger: "blur" }],
+            };
+        },
     },
 
-    async getDictOptions() {
-      this.$http
-        .post("/sys/dict/data/dictlist", {
-          dictType: "user_demand_service_type",
-        })
-        .then(({ data: res }) => {
-          if (res.code !== 0) {
-            return this.$message.error(res.msg);
-          } else {
-            this.serviceOptions =  res.data.filter(item=>item.value == 'party_unit'||item.value == 'community_org'||item.value == 'publicWelfare');
-          }
-        })
-        .catch(() => {
-          return this.$message.error("网络错误");
-        });
+    watch: {
+        "formData.serviceTimeEnd": function (val) {
+            if (val && val != "") {
+                let arrayTemp = val.split(" ");
+                this.formData.serviceTimeEnd = arrayTemp[0] + " 23:59:59";
+            }
+        },
     },
 
-    // 字典
-    // async getCategrayList() {
-    //   const url = "/sys/dict/data/dictlist";
+    components: { labelForm, UploadImages },
 
-    //   let params = {
-    //     dictType: "ic_service_type",
-    //   };
+    async mounted() {
+        this.startLoading();
+        // 都已经重置了，还放在prop里干嘛，我不理解
+        this.categrayOptions = this.categrayArray;
 
-    //   const { data, code, msg } = await requestPost(url, params);
-
-    //   if (code === 0) {
-    //     this.categrayOptions = data;
-    //   } else {
-    //     this.$message.error(msg);
-    //   }
-    // },
-    async handleServiceChange(type, val) {
-      if (val === "social_org") {
-        if (type === "add") await this.getServiceuserList(val);
-        else this.getServiceuserList(val);
-      } else this.getServiceuserList(val);
-    },
-
-    async getServiceuserList(serverOrgType) {
-      if (!serverOrgType) return false;
-      if (this.formData.categoryCode.length === 0) {
-        this.$message.error("请先选择服务类别!");
-        return;
-      }
-      const url = "/actual/base/serviceitem/listServerOrgNewTask";
-      let params = {
-        serverOrgCategoryCode: this.formData.categoryCode[1],
-        serverParentOrgCategoryCode:this.formData.categoryCode[0],
-        serverOrgType: serverOrgType,
-      };
-      let { data, code, msg } = await requestPost(url, params);
-      if (code == 0) {
-        this.serviceOptiondList = data;
-      } else if (code >= 8000) {
-        this.$message.error(msg);
-      }
-    },
+        // this.getCategrayList();
+        this.getDictOptions();
+        this.getPolicyList();
+        await this.loadScopeTree();
+        if (this.formType === "add") {
+            this.$refs.ref_form.resetFields();
+        } else if (this.formType == "edit") {
+            await this.loadInfo();
+        }
+        await this.getDemandOptions()
+        await this.iniDefaultData();
+
+        this.endLoading();
+        // 服务分类下拉（其实是获取的共性服务分类）
+    },
+
+    methods: {
+        handelDisabledRules(v) {
+            if (!v) {
+                delete this.dataRule.resiSearchTagId;
+            } else {
+                var arr = [
+                    {
+                        required: true,
+                        message: "享受服务人员不能为空",
+                        trigger: "change",
+                    },
+                ];
+                this.dataRule.resiSearchTagId = arr;
+            }
+            console.log(this.dataRule);
+        },
+        async getDemandOptions() {
+            this.$http
+                .post("/actual/base/serviceitem/listAllCategory")
+                .then(({ data: res }) => {
+                    if (res.code !== 0) {
+                        return this.$message.error(res.msg);
+                    } else {
+                        this.demandOptions = this.getFlagData(
+                            this.getTreeData(res.data),
+                            "usableFlag"
+                        ).filter((item) => item.categoryCode == '1038' || item.categoryCode == '1039' || item.categoryCode == '1041');
+                    }
+                })
+                .catch(() => {
+                    return this.$message.error("网络错误");
+                });
+        },
+        getFlagData(data, flag) {
+            if (!Array.isArray(data)) return [];
+            let arr1 = data.filter((item) => item[flag]);
+            let arr2 = arr1.map((item) => {
+                if (item.childCateList)
+                    return { ...item, childCateList: this.getFlagData(item.childCateList, flag) };
+                else return item;
+            });
+            // console.log('arrr-oppp', arr2)
+            return arr2;
+        },
+        getTreeData(data) {
+            if (!Array.isArray(data)) return [];
+            let arr = data.map((item) => {
+                let _item = {};
+                if (item.childCateList) {
+                    if (item.childCateList.length === 0)
+                        _item = { ...item, childCateList: undefined };
+                    else _item = { ...item, childCateList: this.getTreeData(item.childCateList) };
+                } else {
+                    _item = { ...item };
+                }
+                return _item;
+            });
+            return arr;
+        },
+        //获取服务详情数据
+        async loadInfo() {
+            const url = "/governance/icServiceRecordV2/detail";
+            let params = {
+                serviceRecordId: this.serviceRecordId,
+            };
+
+            const { data, code, msg } = await requestPost(url, params);
+
+            if (code === 0) {
+                this.formData = { ...data };
+                if (data.categoryCode) {
+                    this.formData.categoryCode = [data.parentCategoryCode, data.categoryCode];
+                } else {
+                    this.formData.categoryCode = [data.parentCategoryCode];
+                }
+                if (!data.noticeApproches) {
+                    this.formData.noticeApproches = [];
+                }
+                this.scopeIdArray = data.gridIdList.map(i => i.objectId);
+                this.feedbackFormData = { ...data.feedback };
+                await this.getServiceuserList(this.formData.serviceOrgType);
+                await this.getTagName();
+                // this.fileList = []
+                // if (data.feedback && data.feedback.fileList && data.feedback.fileList.length > 0) {
+                //   data.feedback.fileList.forEach(element => {
+                //     let obj = {
+                //       name: element.name,
+                //       format: element.format,
+                //       url: element.url,
+                //     }
+                //     this.fileList.push(obj)
+                //   });
+                // }
+            } else {
+                this.$message.error(msg);
+            }
+        },
+        async getTagName() {
+            const url = "/governance/resiSearchTag/listResiSearchTags";
+            let params = {
+                pageSize: 99,
+            };
+            let { data, msg, code } = await requestPost(url, params);
+            if (code == 0) {
+                let showAddProduct = data.list.filter((item) => {
+                    return [this.formData.resiSearchTagId].includes(item.tagId);
+                });
+                this.formData.resiSearchTagName = showAddProduct[0].tagName;
+            } else {
+                this.$message.error(msg);
+            }
+        },
+        handleClickLabel() {
+            this.showLabelForm = true;
+            this.$nextTick(() => {
+                this.$refs["ref_label_form"].initForm("info");
+            });
+        },
+        addFormOk(val) {
+            this.showLabelForm = false;
+            this.formData.resiSearchTagId = val.tagId;
+            this.formData.resiSearchTagName = val.tagName;
+        },
+        addFormCancle() {
+            this.showLabelForm = false;
+        },
+        handleCloseTag() {
+            this.formData.resiSearchTagId = "";
+            this.formData.resiSearchTagName = "";
+        },
+        getLastItem(list, vals, key) {
+            let LIST = list || [];
+            for (let item of LIST) {
+                for (let i of vals) {
+                    if (item[key] === i) {
+                        this.sarr.push(item);
+                    } else if (item["objectType"] == "district") {
+                        this.getLastItem(item.children, vals, key);
+                    } else {
+                        this.getLastItem(item.children, vals, key);
+                    }
+                }
+            }
+        },
+        async handleTreeList() {
+            const map = new Map();
+            await this.getLastItem(this.casOptions, this.scopeIdArray, "objectId");
+            let temp = [];
+            //递归出的数据会有重复,因为一个街道下面有两个社区的话就会循环push两遍,在这里去重
+            temp = this.sarr.filter(
+                (v) => !map.has(v.objectId) && map.set(v.objectId, 1)
+            );
+            for (let i in temp) {
+                this.scopeIdArray.push({
+                    objectId: temp[i].objectId,
+                    objectType: temp[i].objectType,
+                    objectName: temp[i].objectName,
+                });
+            }
+            temp = [];
+            //  如果是编辑的话回填的数据会有数组字符串需要将不是对象属性的过滤掉
+            let arr = [];
+            // let isOk = false;
+            this.scopeIdArray.forEach((item) => {
+                if (typeof item != "string") {
+                    arr.push(item);
+                }
+            });
+            return arr;
+        },
+        handleChangeFeedback(val) {
+            this.showFeedback = val;
+
+            // if (this.firstInitMap) {
+            //   this.$nextTick(() => {
+            //     this.initMap();
+            //   });
+            // }
+        },
+        async iniDefaultData() {
+            const { defaultData } = this;
+            if (defaultData) {
+                const { serviceOrgType, serviceOrgId, scopeIdArray } = defaultData;
+                if (serviceOrgType) {
+                    this.formData.serviceOrgType = serviceOrgType;
+                    await this.getServiceuserList(serviceOrgType, "add_demand");
+                }
+                if (serviceOrgId) {
+                    this.formData.serviceOrgId = serviceOrgId;
+                }
+                if (scopeIdArray) {
+                    this.scopeIdArray = scopeIdArray;
+                    await nextTick();
+                    this.handleChangeScope();
+                }
+            }
+        },
 
-    // 获取服务范围树
-    async loadScopeTree() {
-      const url = "/gov/org/icServiceProject/service/serviceScopeTree";
-      // const url = 'http://yapi.elinkservice.cn/mock/245/gov/org/isServiceProject/service/serviceScopeTree'
-      let params = {};
+        handleClose() {
+            this.showPersonList = false;
+        },
+        handleOk() {
+            this.showPersonList = false;
+        },
 
-      const { data, code, msg } = await requestPost(url, params);
+        async getPolicyList() {
+            const url = "/governance/policy/policyList";
 
-      if (code === 0) {
-        ++this.iscascaderShow;
-        this.casOptions = [];
-        this.scopeIdArray = [];
-        this.casOptions.push(data);
-      } else {
-        this.$message.error(rspMsg);
-      }
-    },
+            let params = {};
 
-    handleChangeScope(value) {
-      this.formData.gridIdList = [];
-      let selArray = this.$refs["myCascader"].getCheckedNodes();
-      console.log("handleChangeScope", selArray);
-      selArray.forEach((element) => {
-        let obj = {
-          objectType: element.data.objectType,
-          objectId: element.data.objectId,
-          objectName: element.data.objectName,
-        };
-        this.formData.gridIdList.push(obj);
-      });
-    },
+            const { data, code, msg } = await requestPost(url, params);
 
-    async handleComfirm() {
-      if (this.formType === "add") {
-        this.handleAdd();
-      } else if (this.formType === "feedback") {
-        this.handleFeedback();
-      } else if (this.formType === "edit") {
-        this.handleAdd();
-      }
-    },
+            if (code === 0) {
+                this.policyList = data;
+            } else {
+                this.$message.error(msg);
+            }
+        },
 
-    async handleAdd() {
-      this.btnDisable = true;
-      setTimeout(() => {
-        this.btnDisable = false;
-      }, 10000);
-      this.formData.gridIdList = await this.handleTreeList();
-      this.$refs["ref_form"].validate((valid, messageObj) => {
-        if (!valid) {
-          app.util.validateRule(messageObj);
-          this.btnDisable = false;
-        } else {
-          var oDate1 = new Date(this.formData.serviceTimeStart);
-          var oDate2 = new Date(this.formData.serviceTimeEnd);
-          if (oDate1.getTime() > oDate2.getTime()) {
-            this.$message.error("服务截止时间必须大于服务开始时间");
-            return false;
-          }
-          this.addFuwu();
-        }
-      });
-    },
-    async handleFeedback() {
-      this.btnDisable = true;
-      setTimeout(() => {
-        this.btnDisable = false;
-      }, 10000);
+        async getDictOptions() {
+            this.$http
+                .post("/sys/dict/data/dictlist", {
+                    dictType: "user_demand_service_type",
+                })
+                .then(({ data: res }) => {
+                    if (res.code !== 0) {
+                        return this.$message.error(res.msg);
+                    } else {
+                        this.serviceOptions = res.data.filter(item => item.value == 'party_unit' || item.value == 'community_org' || item.value == 'publicWelfare');
+                    }
+                })
+                .catch(() => {
+                    return this.$message.error("网络错误");
+                });
+        },
 
-      this.$refs["ref_form_feedback"].validate((valid, messageObj) => {
-        if (!valid) {
-          app.util.validateRule(messageObj);
-          this.btnDisable = false;
-        } else {
-          this.addFeecback();
-        }
-      });
-    },
-    async addFeecback() {
-      // this.feedbackFormData.fileList = [];
-      // this.feedbackFormData.fileList = [...this.fileList];
-      this.feedbackFormData.serviceRecordId = this.serviceRecordId;
+        // 字典
+        // async getCategrayList() {
+        //   const url = "/sys/dict/data/dictlist";
+
+        //   let params = {
+        //     dictType: "ic_service_type",
+        //   };
+
+        //   const { data, code, msg } = await requestPost(url, params);
+
+        //   if (code === 0) {
+        //     this.categrayOptions = data;
+        //   } else {
+        //     this.$message.error(msg);
+        //   }
+        // },
+        async handleServiceChange(type, val) {
+            if (val === "social_org") {
+                if (type === "add") await this.getServiceuserList(val);
+                else this.getServiceuserList(val);
+            } else this.getServiceuserList(val);
+        },
 
-      console.log(this.feedbackFormData);
+        async getServiceuserList(serverOrgType) {
+            if (!serverOrgType) return false;
+            if (this.formData.categoryCode.length === 0) {
+                this.$message.error("请先选择服务类别!");
+                return;
+            }
+            const url = "/actual/base/serviceitem/listServerOrgNewTask";
+            let params = {
+                serverOrgCategoryCode: this.formData.categoryCode[1],
+                serverParentOrgCategoryCode: this.formData.categoryCode[0],
+                serverOrgType: serverOrgType,
+            };
+            let { data, code, msg } = await requestPost(url, params);
+            if (code == 0) {
+                this.serviceOptiondList = data;
+            } else if (code >= 8000) {
+                this.$message.error(msg);
+            }
+        },
 
-      const url = "/governance/icServiceFeedbackV2/add";
-      let params = {
-        ...this.feedbackFormData,
-      };
+        // 获取服务范围树
+        async loadScopeTree() {
+            const url = "/gov/org/icServiceProject/service/serviceScopeTree";
+            // const url = 'http://yapi.elinkservice.cn/mock/245/gov/org/isServiceProject/service/serviceScopeTree'
+            let params = {};
+
+            const { data, code, msg } = await requestPost(url, params);
+
+            if (code === 0) {
+                ++this.iscascaderShow;
+                this.casOptions = [];
+                this.scopeIdArray = [];
+                this.casOptions.push(data);
+            } else {
+                this.$message.error(rspMsg);
+            }
+        },
 
-      const { data, code, msg } = await requestPost(url, params);
+        handleChangeScope(value) {
+            this.formData.gridIdList = [];
+            let selArray = this.$refs["myCascader"].getCheckedNodes();
+            console.log("handleChangeScope", selArray);
+            selArray.forEach((element) => {
+                let obj = {
+                    objectType: element.data.objectType,
+                    objectId: element.data.objectId,
+                    objectName: element.data.objectName,
+                };
+                this.formData.gridIdList.push(obj);
+            });
+        },
 
-      if (code === 0) {
-        this.$message.success("反馈成功");
-        this.resetData();
-        this.$emit("handleOk");
-      } else {
-        this.$message.error(msg);
-      }
-    },
-    async addFuwu() {
-      if (this.showFeedback) {
-        this.formData.feedback = { ...this.feedbackFormData };
-      } else {
-        this.formData.feedback = null;
-      }
-      let params = {
-        categoryCode:this.formData.categoryCode[1]?this.formData.categoryCode[1]:'',
-        parentCategoryCode:this.formData.categoryCode[0],
-        resiSearchTagId: this.formData.resiSearchTagId,
-        resiSearchTagName: this.formData.resiSearchTagName,
-        serviceName: this.formData.serviceName,
-        noticeApproches: this.formData.noticeApproches,
-        policyId: this.formData.policyId,
-        serviceOrgType: this.formData.serviceOrgType,
-        serviceOrgId: this.formData.serviceOrgId,
-        objList: this.formData.gridIdList,
-        principalName: this.formData.principalName,
-        principalContact: this.formData.principalContact,
-        serviceTimeStart: this.formData.serviceTimeStart,
-        serviceTimeEnd: this.formData.serviceTimeEnd,
-        remark: this.formData.remark,
-        feedback:this.formData.feedback,
-        serviceRecordId:this.serviceRecordId,
-      };
-      let url = "";
-      if (this.formType != "edit") {
-        url = "/governance/icServiceRecordV2/searchAdd";
-      } else {
-        url = "/governance/icServiceRecordV2/searchUpdate";
-        params.attachments = this.formData.attachments
-      }
-      // const url = 'http://yapi.elinkservice.cn/mock/245/governance/icServiceProject/service/initiate'
+        async handleComfirm() {
+            if (this.formType === "add") {
+                this.handleAdd();
+            } else if (this.formType === "feedback") {
+                this.handleFeedback();
+            } else if (this.formType === "edit") {
+                this.handleAdd();
+            }
+        },
 
-      const { data, code, msg } = await requestPost(url, params);
-      if (code === 0) {
-        this.$message.success("发起成功");
-        this.resetData();
-        this.$emit("handleOk");
-      } else {
-        this.$message.error(msg);
-      }
-    },
+        async handleAdd() {
+            this.btnDisable = true;
+            setTimeout(() => {
+                this.btnDisable = false;
+            }, 10000);
+            this.formData.gridIdList = await this.handleTreeList();
+            this.$refs["ref_form"].validate((valid, messageObj) => {
+                if (!valid) {
+                    app.util.validateRule(messageObj);
+                    this.btnDisable = false;
+                } else {
+                    var oDate1 = new Date(this.formData.serviceTimeStart);
+                    var oDate2 = new Date(this.formData.serviceTimeEnd);
+                    if (oDate1.getTime() > oDate2.getTime()) {
+                        this.$message.error("服务截止时间必须大于服务开始时间");
+                        return false;
+                    }
+                    this.addFuwu();
+                }
+            });
+        },
+        async handleFeedback() {
+            this.btnDisable = true;
+            setTimeout(() => {
+                this.btnDisable = false;
+            }, 10000);
+
+            this.$refs["ref_form_feedback"].validate((valid, messageObj) => {
+                if (!valid) {
+                    app.util.validateRule(messageObj);
+                    this.btnDisable = false;
+                } else {
+                    this.addFeecback();
+                }
+            });
+        },
+        async addFeecback() {
+            // this.feedbackFormData.fileList = [];
+            // this.feedbackFormData.fileList = [...this.fileList];
+            this.feedbackFormData.serviceRecordId = this.serviceRecordId;
+
+            console.log(this.feedbackFormData);
+
+            const url = "/governance/icServiceFeedbackV2/add";
+            let params = {
+                ...this.feedbackFormData,
+            };
+            
+            const { data, code, msg } = await requestPost(url, params);
+
+            if (code === 0) {
+                this.$message.success("反馈成功");
+                this.resetData();
+                this.$emit("handleOk");
+            } else {
+                this.$message.error(msg);
+            }
+        },
+        async addFuwu() {
+            if (this.showFeedback) {
+                this.formData.feedback = { ...this.feedbackFormData };
+            } else {
+                this.formData.feedback = null;
+            }
+            let params = {
+                categoryCode: this.formData.categoryCode[1] ? this.formData.categoryCode[1] : '',
+                parentCategoryCode: this.formData.categoryCode[0],
+                resiSearchTagId: this.formData.resiSearchTagId,
+                resiSearchTagName: this.formData.resiSearchTagName,
+                serviceName: this.formData.serviceName,
+                noticeApproches: this.formData.noticeApproches,
+                policyId: this.formData.policyId,
+                serviceOrgType: this.formData.serviceOrgType,
+                serviceOrgId: this.formData.serviceOrgId,
+                objList: this.formData.gridIdList,
+                principalName: this.formData.principalName,
+                principalContact: this.formData.principalContact,
+                serviceTimeStart: this.formData.serviceTimeStart,
+                serviceTimeEnd: this.formData.serviceTimeEnd,
+                serviceStatus:this.formData.serviceStatus,
+                remark: this.formData.remark,
+                feedback: this.formData.feedback,
+                serviceRecordId: this.serviceRecordId,
+            };
+            let url = "";
+            if (this.formType != "edit") {
+                url = "/governance/icServiceRecordV2/searchAdd";
+            } else {
+                url = "/governance/icServiceRecordV2/searchUpdate";
+                params.attachments = this.formData.attachments
+            }
+            // const url = 'http://yapi.elinkservice.cn/mock/245/governance/icServiceProject/service/initiate'
+
+            const { data, code, msg } = await requestPost(url, params);
+            if (code === 0) {
+                this.$message.success("发起成功");
+                this.resetData();
+                this.$emit("handleOk");
+            } else {
+                this.$message.error(msg);
+            }
+        },
 
-    handleCancle() {
-      this.resetData();
-      this.$emit("handleClose");
-    },
+        handleCancle() {
+            this.resetData();
+            this.$emit("handleClose");
+        },
 
-    resetData() {
-      this.formData = {
-        categoryCode:[],
-        parentCategoryCode:'',
-        gridIdList: [], //
-        principalName: "", //经办人(责任人)姓名
-        principalContact: "", //经办人联系方式
-        serviceTimeStart: "", //服务起始时间yyyy-MM-dd
-        serviceTimeEnd: "", //服务截止时间yyyy-MM-dd
-        remark: "", //
-      };
-      this.feedbackFormData = {
-        serviceGoal: "", //	服务目标
-        serviceEffect: "", //	服务效果
-        servicePeopleNumber: null, //	服务人数
-        serviceStatus: "completed", //	服务状态。in_service服务中；completed:已完成
-        satisfaction: "", //满意度。不满意:bad、基本满意:good、非常满意:perfect
-        longitude: "", //	经度
-        latitude: "", //	维度
-        address: "",
-        fileList: [], //	附件列表
-      };
-    },
-    // 开启加载动画
-    startLoading() {
-      loading = Loading.service({
-        lock: true, // 是否锁定
-        text: "正在加载……", // 加载中需要显示的文字
-        background: "rgba(0,0,0,.7)", // 背景颜色
-      });
-    },
-    // 结束加载动画
-    endLoading() {
-      // clearTimeout(timer);
-      if (loading) {
-        loading.close();
-      }
+        resetData() {
+            this.formData = {
+                categoryCode: [],
+                parentCategoryCode: '',
+                gridIdList: [], //
+                principalName: "", //经办人(责任人)姓名
+                principalContact: "", //经办人联系方式
+                serviceTimeStart: "", //服务起始时间yyyy-MM-dd
+                serviceTimeEnd: "", //服务截止时间yyyy-MM-dd
+                remark: "", //
+            };
+            this.feedbackFormData = {
+                serviceGoal: "", //	服务目标
+                serviceEffect: "", //	服务效果
+                servicePeopleNumber: null, //	服务人数
+                serviceStatus: "completed", //	服务状态。in_service服务中；completed:已完成
+                satisfaction: "", //满意度。不满意:bad、基本满意:good、非常满意:perfect
+                longitude: "", //	经度
+                latitude: "", //	维度
+                address: "",
+                fileList: [], //	附件列表
+            };
+        },
+        // 开启加载动画
+        startLoading() {
+            loading = Loading.service({
+                lock: true, // 是否锁定
+                text: "正在加载……", // 加载中需要显示的文字
+                background: "rgba(0,0,0,.7)", // 背景颜色
+            });
+        },
+        // 结束加载动画
+        endLoading() {
+            // clearTimeout(timer);
+            if (loading) {
+                loading.close();
+            }
+        },
     },
-  },
 };
 </script>
   
-    <style lang="scss" scoped>
+<style lang="scss" scoped>
 @import "@/assets/scss/modules/management/form-main.scss";
 @import "@/assets/scss/modules/visual/a_customize.scss";
 
 .form-item::v-deep .el-form-item__label {
-  color: #fff;
+    color: #fff;
 }
+
 .form-item {
-  .el-radio {
-    color: #fff;
-  }
+    .el-radio {
+        color: #fff;
+    }
 
-  .el-checkbox {
-    color: #fff;
-  }
+    .el-checkbox {
+        color: #fff;
+    }
 }
 </style>
   
diff --git a/src/views/modules/communityService/fuwuzhaoren/editForm.vue b/src/views/modules/communityService/fuwuzhaoren/editForm.vue
index d5877eced..a68a59d27 100644
--- a/src/views/modules/communityService/fuwuzhaoren/editForm.vue
+++ b/src/views/modules/communityService/fuwuzhaoren/editForm.vue
@@ -14,7 +14,7 @@
                         style="display: block">
             <span>{{formData.serviceName}}</span>
             <!-- <el-select class="item_width_1"
-                       v-model="formData.serviceProjectId"
+                       v-model.trim="formData.serviceProjectId"
                        placeholder="请选择"
                        filterable
                        clearable>
@@ -33,7 +33,7 @@
                         style="display: block">
             <span>{{serviceOrgName}}</span>
             <!-- <el-select class="item_width_1"
-                       v-model="formData.serviceOrgId"
+                       v-model.trim="formData.serviceOrgId"
                        placeholder="请选择"
                        filterable
                        clearable>
@@ -56,7 +56,7 @@
             </div>
             <!-- <el-cascader class="item_width_1"
                          ref="myCascader"
-                         v-model="scopeIdArray"
+                         v-model.trim="scopeIdArray"
                          :key="iscascaderShow"
                          :options="casOptions"
                          :props="optionProps"
@@ -69,7 +69,7 @@
                         label-width="150px"
                         style="display: block">
             <el-select :disabled="formType==='detail'"
-                       v-model="formData.policyId"
+                       v-model.trim="formData.policyId"
                        class="input-width-small"
                        placeholder="请选择"
                        clearable>
@@ -93,7 +93,7 @@
             <el-input :disabled="formType==='detail'"
                       class="item_width_1"
                       placeholder="请输入经办人姓名"
-                      v-model="formData.principalName">
+                      v-model.trim="formData.principalName">
             </el-input>
           </el-form-item>
           <el-form-item label="联系方式"
@@ -103,11 +103,11 @@
             <el-input :disabled="formType==='detail'"
                       class="item_width_1"
                       placeholder="请输入联系方式"
-                      v-model="formData.principalContact">
+                      v-model.trim="formData.principalContact">
             </el-input>
           </el-form-item>
           <el-form-item label="指派服务" label-width="150px">
-             <el-switch v-model="assignSwitch"> </el-switch>
+             <el-switch v-model.trim="assignSwitch"> </el-switch>
            </el-form-item>
 
             <el-form-item
@@ -117,7 +117,7 @@
             style="display: block"
             v-show="this.assignSwitch"
              >
-             <input type="text" v-model="formData.resiSearchTagId" v-show="false">
+             <input type="text" v-model.trim="formData.resiSearchTagId" v-show="false">
               <template  v-if="this.resiSearchTagName">
                 <el-tag   @close="handleCloseTag"  closable style="margin-right:10px;">
                 {{this.resiSearchTagName }}
@@ -133,7 +133,7 @@
                         prop="serviceTimeStart"
                         style="display: block">
             <el-date-picker :disabled="formType==='detail'"
-                            v-model="formData.serviceTimeStart"
+                            v-model.trim="formData.serviceTimeStart"
                             :picker-options="startPickerOptions"
                             class="item_width_2"
                             type="date"
@@ -143,7 +143,7 @@
             </el-date-picker>
             <span class="u-data-tag">至</span>
             <el-date-picker :disabled="formType==='detail'"
-                            v-model="formData.serviceTimeEnd"
+                            v-model.trim="formData.serviceTimeEnd"
                             :picker-options="endPickerOptions"
                             class="item_width_2 u-data-tag"
                             type="date"
@@ -164,7 +164,7 @@
                       show-word-limit
                       :rows="3"
                       placeholder="请输入备注，不超过500字"
-                      v-model="formData.remark"></el-input>
+                      v-model.trim="formData.remark"></el-input>
           </el-form-item>
 
         </el-form>
@@ -188,7 +188,7 @@
                         show-word-limit
                         :rows="3"
                         placeholder="请输入服务目标，不超过1000字"
-                        v-model="feedbackFormData.serviceGoal"></el-input>
+                        v-model.trim="feedbackFormData.serviceGoal"></el-input>
             </el-form-item>
 
             <el-form-item label="服务效果"
@@ -201,7 +201,7 @@
                         show-word-limit
                         :rows="3"
                         placeholder="请输入服务效果，不超过1000字"
-                        v-model="feedbackFormData.serviceEffect"></el-input>
+                        v-model.trim="feedbackFormData.serviceEffect"></el-input>
             </el-form-item>
 
             <el-form-item label="服务人数"
@@ -209,7 +209,7 @@
                           prop="servicePeopleNumber"
                           label-width="150px">
               <el-input-number class="item_width_2"
-                               v-model="feedbackFormData.servicePeopleNumber"
+                               v-model.trim="feedbackFormData.servicePeopleNumber"
                                :min="0"
                                :max="9999"
                                label="服务人数"></el-input-number>
@@ -221,7 +221,7 @@
                           prop="serviceStatus">
               <span>已完成</span>
               <!-- <el-select class="item_width_1"
-                         v-model="feedbackFormData.serviceStatus"
+                         v-model.trim="feedbackFormData.serviceStatus"
                          placeholder="全部"
                          clearable>
                 <el-option v-for="item in statusArray"
@@ -237,7 +237,7 @@
                           label-width="150px"
                           prop="satisfaction">
               <el-select class="item_width_2"
-                         v-model="feedbackFormData.satisfaction"
+                         v-model.trim="feedbackFormData.satisfaction"
                          placeholder="全部"
                          clearable>
                 <el-option v-for="item in satisfyArray"
@@ -253,7 +253,7 @@
                           label-width="150px"
                           style="display: block">
               <el-input class="item_width_1"
-                        v-model="feedbackFormData.address"></el-input>
+                        v-model.trim="feedbackFormData.address"></el-input>
             </el-form-item>
             <!-- <el-form-item label="地图位置"
                           label-width="150px"
@@ -268,7 +268,7 @@
                     <el-input maxlength="50"
                               size="mini"
                               placeholder="请输入关键字"
-                              v-model="keyWords">
+                              v-model.trim="keyWords">
                     </el-input>
                     <el-button style="margin-left: 10px"
                                type="primary"
diff --git a/src/views/modules/communityService/fuwuzhaoren/index.vue b/src/views/modules/communityService/fuwuzhaoren/index.vue
index 037bcaaeb..ce395260c 100644
--- a/src/views/modules/communityService/fuwuzhaoren/index.vue
+++ b/src/views/modules/communityService/fuwuzhaoren/index.vue
@@ -8,7 +8,7 @@
                    :label-width="'100px'">
                    <el-form-item label="服务类别" prop="categoryCode">
                     <el-cascader
-                      v-model="formData.categoryCode"
+                      v-model.trim="formData.categoryCode"
                       class="u-item-width-daterange2"
                       size="small"
                       :options="searchdemandOptions"
@@ -20,7 +20,7 @@
 
             <el-form-item label="服务时间"
                           prop="serviceTimeStart">
-              <el-date-picker v-model="formData.serviceTimeStart"
+              <el-date-picker v-model.trim="formData.serviceTimeStart"
                               :picker-options="startPickerOptions"
                               class="u-item-width-daterange"
                               size="small"
@@ -30,7 +30,7 @@
                               placeholder="开始时间">
               </el-date-picker>
               <span class="u-data-tag">至</span>
-              <el-date-picker v-model="formData.serviceTimeEnd"
+              <el-date-picker v-model.trim="formData.serviceTimeEnd"
                               :picker-options="endPickerOptions"
                               class="u-item-width-daterange u-data-tag"
                               size="small"
@@ -44,7 +44,7 @@
 
             <el-form-item label="服务事项"
                           prop="serviceName">
-              <el-input v-model="formData.serviceName"
+              <el-input v-model.trim="formData.serviceName"
                         class="u-item-width-normal"
                         size="small"
                         clearable
@@ -54,7 +54,7 @@
 
             <el-form-item label="服务组织"
                           prop="serviceOrgType">
-              <el-select v-model="formData.serviceOrgType"
+              <el-select v-model.trim="formData.serviceOrgType"
                          class="u-item-width-daterange"
                          placeholder="请选择"
                          size="small"
@@ -66,7 +66,7 @@
                            :value="item.value">
                 </el-option>
               </el-select>
-              <el-select v-model="formData.serviceOrgId"
+              <el-select v-model.trim="formData.serviceOrgId"
                          class="u-item-width-daterange u-data-tag"
                          filterable
                          placeholder="请选择"
@@ -85,7 +85,7 @@
             <el-form-item label="服务状态"
                           prop="serviceStatus">
               <el-select class="u-item-width-normal"
-                         v-model="formData.serviceStatus"
+                         v-model.trim="formData.serviceStatus"
                          placeholder="全部"
                          size="small"
                          clearable>
@@ -100,7 +100,7 @@
             <el-form-item label="满意度"
                           prop="satisfaction">
               <el-select class="u-item-width-normal"
-                         v-model="formData.satisfaction"
+                         v-model.trim="formData.satisfaction"
                          placeholder="全部"
                          size="small"
                          clearable>
diff --git a/src/views/modules/communityService/fuwuzhaoren/personList.vue b/src/views/modules/communityService/fuwuzhaoren/personList.vue
index 8db053502..74f4e7567 100644
--- a/src/views/modules/communityService/fuwuzhaoren/personList.vue
+++ b/src/views/modules/communityService/fuwuzhaoren/personList.vue
@@ -17,7 +17,7 @@
         </el-form-item>
         <el-form-item label="人员姓名" prop="title">
           <el-input
-              v-model="searchFormData.name"
+              v-model.trim="searchFormData.name"
               class="u-item-width-normal"
               size="small"
               clearable
@@ -27,7 +27,7 @@
 
         <el-form-item label="手机号" prop="title">
           <el-input
-              v-model="searchFormData.mobile"
+              v-model.trim="searchFormData.mobile"
               class="u-item-width-normal"
               size="small"
               clearable
@@ -37,7 +37,7 @@
 
         <el-form-item label="身份证号" prop="title">
           <el-input
-              v-model="searchFormData.idCard"
+              v-model.trim="searchFormData.idCard"
               class="u-item-width-normal"
               size="small"
               clearable
@@ -47,7 +47,7 @@
 
         <el-form-item label="享受服务次数" prop="title">
           <el-input
-              v-model="searchFormData.serveTimes"
+              v-model.trim="searchFormData.serveTimes"
               class="u-item-width-normal"
               size="small"
               clearable
@@ -56,7 +56,7 @@
         </el-form-item>
 
         <el-form-item label="家庭住址" prop="title">
-          <el-select v-model="searchFormData.villageId" placeholder="请选择小区"
+          <el-select v-model.trim="searchFormData.villageId" placeholder="请选择小区"
                      @change="handleQuarterSelectorsChange" clearable>
             <el-option
                 v-for="item in quartersSelectItems"
@@ -65,7 +65,7 @@
                 :value="item.value">
             </el-option>
           </el-select>
-          <el-select v-model="searchFormData.buildId" placeholder="请选择楼栋"
+          <el-select v-model.trim="searchFormData.buildId" placeholder="请选择楼栋"
                      @change="handleBuildSelectorsChange" clearable>
             <el-option
                 v-for="item in buildingSelectItems"
@@ -74,7 +74,7 @@
                 :value="item.value">
             </el-option>
           </el-select>
-          <el-select v-model="searchFormData.unitId" placeholder="请选择单元"
+          <el-select v-model.trim="searchFormData.unitId" placeholder="请选择单元"
                      @change="handleUnitSelectorsChange" clearable>
             <el-option
                 v-for="item in unitSelectItems"
@@ -83,7 +83,7 @@
                 :value="item.value">
             </el-option>
           </el-select>
-          <el-select v-model="searchFormData.homeId" placeholder="请选择房屋"
+          <el-select v-model.trim="searchFormData.homeId" placeholder="请选择房屋"
                      @change="handleUnitSelectorsChange" clearable>
             <el-option
                 v-for="item in homeSelectItems"
diff --git a/src/views/modules/communityService/fuwuzuzhi/cpts/edit.vue b/src/views/modules/communityService/fuwuzuzhi/cpts/edit.vue
index aacb34f40..ee7817cd0 100644
--- a/src/views/modules/communityService/fuwuzuzhi/cpts/edit.vue
+++ b/src/views/modules/communityService/fuwuzuzhi/cpts/edit.vue
@@ -12,7 +12,7 @@
                       label-width="150px"
                       style="display: block">
           <el-select v-if="formType == 'add' || formType == 'edit'"
-                     v-model="fmData.serviceTypeArr"
+                     v-model.trim="fmData.serviceTypeArr"
                      placeholder="请选择"
                      clearable
                      multiple>
@@ -35,7 +35,7 @@
                     maxlength="100"
                     show-word-limit
                     placeholder="请输入项目名称"
-                    v-model="fmData.orgName">
+                    v-model.trim="fmData.orgName">
           </el-input>
           <div style="width: 610px"
                v-else>{{ fmData.orgName || "--" }}</div>
@@ -52,7 +52,7 @@
                     show-word-limit
                     :rows="3"
                     placeholder="请输入服务内容，不超过1000字"
-                    v-model="fmData.orgDescribe"></el-input>
+                    v-model.trim="fmData.orgDescribe"></el-input>
           <div style="width: 610px"
                v-else>
             {{ fmData.orgDescribe || "--" }}
@@ -68,7 +68,7 @@
                     maxlength="100"
                     show-word-limit
                     placeholder="请输入负责人姓名"
-                    v-model="fmData.principalName"></el-input>
+                    v-model.trim="fmData.principalName"></el-input>
           <div style="width: 610px"
                v-else>
             {{ fmData.principalName || "--" }}
@@ -84,7 +84,7 @@
                     maxlength="11"
                     show-word-limit
                     placeholder="请输入联系方式"
-                    v-model="fmData.principalMobile"></el-input>
+                    v-model.trim="fmData.principalMobile"></el-input>
           <div style="width: 610px"
                v-else>
             {{ fmData.principalMobile || "--" }}
@@ -96,7 +96,7 @@
                       label-width="150px"
                       style="display: block">
           <div style="width: 500px">
-            <el-select v-model="searchValue"
+            <el-select v-model.trim="searchValue"
                        filterable
                        style="width: 500px"
                        remote
@@ -122,7 +122,7 @@
                       style="display: block">
 
           <el-input class="item_width_1"
-                    v-model="fmData.address">
+                    v-model.trim="fmData.address">
           </el-input>
 
         </el-form-item>
@@ -138,7 +138,7 @@
                     show-word-limit
                     :rows="3"
                     placeholder="请输入备注，不超过500字"
-                    v-model="fmData.remark"></el-input>
+                    v-model.trim="fmData.remark"></el-input>
           <div style="width: 610px"
                v-else>{{ fmData.remark || "--" }}</div>
         </el-form-item>
diff --git a/src/views/modules/communityService/fuwuzuzhi/index.vue b/src/views/modules/communityService/fuwuzuzhi/index.vue
index 77e1032d6..710a56870 100644
--- a/src/views/modules/communityService/fuwuzuzhi/index.vue
+++ b/src/views/modules/communityService/fuwuzuzhi/index.vue
@@ -9,7 +9,7 @@
           <div>
             <el-form-item label="服务类别"
                           prop="serviceType">
-              <el-select v-model="searchData.serviceType"
+              <el-select v-model.trim="searchData.serviceType"
                          placeholder="请选择"
                          size="small"
                          clearable
@@ -23,7 +23,7 @@
             </el-form-item>
             <el-form-item label="服务组织"
                           prop="orgName">
-              <el-input v-model="searchData.orgName"
+              <el-input v-model.trim="searchData.orgName"
                         class="item_width_1"
                         size="small"
                         clearable
@@ -33,7 +33,7 @@
 
             <el-form-item label="服务地址"
                           prop="address">
-              <el-input v-model="searchData.address"
+              <el-input v-model.trim="searchData.address"
                         class="item_width_2"
                         size="small"
                         clearable
@@ -43,7 +43,7 @@
 
             <el-form-item label="备注"
                           prop="remark">
-              <el-input v-model="searchData.remark"
+              <el-input v-model.trim="searchData.remark"
                         class="item_width_2"
                         size="small"
                         clearable
diff --git a/src/views/modules/communityService/gangweizhaoren/addForm.vue b/src/views/modules/communityService/gangweizhaoren/addForm.vue
index 453ad30ff..c527d1710 100644
--- a/src/views/modules/communityService/gangweizhaoren/addForm.vue
+++ b/src/views/modules/communityService/gangweizhaoren/addForm.vue
@@ -1,33 +1,19 @@
 <template>
-  <div>
-    <div
-      class="dialog-h-content scroll-h"
-      :class="{ 'visiual-form': source === 'visiual' }"
-    >
-      <el-form
-        v-if="formType === 'add' || formType === 'edit'"
-        ref="ref_form"
-        :inline="true"
-        :model="formData"
-        :rules="dataRule"
-        class="div_form"
-      >
-      <el-form-item label="需求类型" prop="categoryCode" label-width="150px">
-          <el-cascader
-            v-model="formData.categoryCode"
-            :options="demandOptions"
-            :props="{label: 'categoryName',value: 'categoryCode',children: 'childCateList'}"
-            clearable
-            size="small"
-            class="u-item-width-normal"
-          ></el-cascader>
-        </el-form-item>
-        <!-- <el-form-item label="政策依据"
+    <div>
+        <div class="dialog-h-content scroll-h" :class="{ 'visiual-form': source === 'visiual' }">
+            <el-form v-if="formType === 'add' || formType === 'edit'" ref="ref_form" :inline="true" :model="formData"
+                :rules="dataRule" class="div_form">
+                <el-form-item label="需求类型" prop="categoryCode" label-width="150px">
+                    <el-cascader v-model.trim="formData.categoryCode" :options="demandOptions"
+                        :props="{ label: 'categoryName', value: 'categoryCode', children: 'childCateList' }" clearable
+                        size="small" class="u-item-width-normal"></el-cascader>
+                </el-form-item>
+                <!-- <el-form-item label="政策依据"
                         prop="policyId"
                         label-width="150px"
                         style="display: block">
             <el-select :disabled="formType==='detail'"
-                       v-model="formData.policyId"
+                       v-model.trim="formData.policyId"
                        class="input-width-small"
                        placeholder="请选择"
                        clearable>
@@ -38,202 +24,92 @@
               </el-option>
             </el-select>
           </el-form-item> -->
-        <el-form-item
-          label="服务事项"
-          prop="serviceName"
-          label-width="150px"
-          :class="{ 'form-item': source === 'visiual' }"
-          style="display: block"
-        >
-          <el-input
-            class="item_width_1"
-            placeholder="请输入服务事项"
-            v-model="formData.serviceName"
-          >
-          </el-input>
-        </el-form-item>
-
-        <el-form-item
-          label="服务内容"
-          prop="remark"
-          label-width="150px"
-          :class="{ 'form-item': source === 'visiual' }"
-          style="display: block"
-        >
-          <el-input
-            class="item_width_1"
-            type="textarea"
-            maxlength="1000"
-            show-word-limit
-            :rows="3"
-            placeholder="请输入备注，不超过1000字"
-            v-model="formData.remark"
-          ></el-input>
-        </el-form-item>
-        <el-form-item
-          label="查找享受服务人员"
-          prop="resiSearchTagId"
-          :class="{ 'form-item': source === 'visiual' }"
-          label-width="150px"
-          style="display: block"
-        >
-          <input
-            type="text"
-            v-model="formData.resiSearchTagId"
-            v-show="false"
-          />
-          <template
-            style="margin-right: 10px"
-            v-if="formData.resiSearchTagName"
-          >
-            <el-tag @close="handleCloseTag" closable style="margin-right: 10px">
-              {{ formData.resiSearchTagName }}
-            </el-tag>
-          </template>
-
-          <el-button type="primary" @click="handleClickLabel" size="mini">
-            <span> <i class="el-icon-plus"></i> 按标签查找 </span>
-          </el-button>
-        </el-form-item>
-        <el-form-item
-          label="服务组织"
-          prop="serviceOrgId"
-          label-width="150px"
-          :class="{ 'form-item': source === 'visiual' }"
-          style="display: block"
-        >
-          <el-select
-            v-model="formData.serviceOrgType"
-            class="input-width-small"
-            placeholder="请选择"
-            clearable
-            @change="handleServiceChange('add', $event)"
-          >
-            <el-option
-              v-for="item in serviceOptions"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"
-            >
-            </el-option>
-          </el-select>
-          -
-          <el-select
-            v-model="formData.serviceOrgId"
-            class="input-width-middle"
-            filterable
-            placeholder="请选择"
-            clearable
-          >
-            <el-option
-              v-for="item in serviceOptiondList"
-              :key="item.id"
-              :label="item.label"
-              :value="item.id"
-            >
-            </el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item
-          prop="noticeApproches"
-          label="自动通知服务组织"
-          label-width="150px"
-          style="display: block"
-        >
-          <el-checkbox-group v-model="formData.noticeApproches">
-            <el-checkbox label="sms" value="sms">短信通知</el-checkbox>
-            <el-checkbox label="wx_official_account" value="wx_official_account">微信公众号消息通知</el-checkbox>
-          </el-checkbox-group>
-        </el-form-item>
-        <el-form-item
-          label="服务范围"
-          prop="gridIdList"
-          label-width="150px"
-          :class="{ 'form-item': source === 'visiual' }"
-          style="display: block"
-        >
-          <el-cascader
-            class="item_width_1"
-            ref="myCascader"
-            v-model="scopeIdArray"
-            :key="iscascaderShow"
-            :options="casOptions"
-            :props="optionProps"
-            :show-all-levels="false"
-            collapse-tags
-            @change="handleChangeScope"
-          ></el-cascader>
-        </el-form-item>
-
-        <el-form-item
-          label="服务时间"
-          label-width="150px"
-          :class="{ 'form-item': source === 'visiual' }"
-          prop="serviceTimeStart"
-        >
-          <el-date-picker
-            v-model="formData.serviceTimeStart"
-            :picker-options="startPickerOptions"
-            class="item_width_2"
-            style="width: 220px"
-            type="date"
-            value-format="yyyy-MM-dd HH:mm:ss"
-            value="yyyy-MM-dd"
-            placeholder="开始时间"
-          >
-          </el-date-picker>
-          <span class="u-data-tag">至</span>
-          <el-date-picker
-            v-model="formData.serviceTimeEnd"
-            :picker-options="endPickerOptions"
-            class="item_width_2 u-data-tag"
-            style="width: 220px"
-            type="date"
-            value-format="yyyy-MM-dd HH:mm:ss"
-            value="yyyy-MM-dd"
-            placeholder="结束时间"
-          >
-          </el-date-picker>
-        </el-form-item>
-
-        <el-form-item
-          label="经办人"
-          prop="principalName"
-          :class="{ 'form-item': source === 'visiual' }"
-          label-width="150px"
-          style="display: block"
-        >
-          <el-input
-            class="item_width_1"
-            placeholder="请输入联系人姓名"
-            v-model="formData.principalName"
-          >
-          </el-input>
-        </el-form-item>
-        <el-form-item
-          label="联系方式"
-          prop="principalContact"
-          :class="{ 'form-item': source === 'visiual' }"
-          label-width="150px"
-          style="display: block"
-        >
-          <el-input
-            class="item_width_1"
-            placeholder="请输入联系人电话"
-            v-model="formData.principalContact"
-          >
-          </el-input>
-        </el-form-item>
-        <el-form-item
-            label="上传图片"
-            label-width="150px"
-            style="display: block"
-            prop="attachments"
-            v-if="formType === 'edit'"
-        >
-          <UploadImages :fileList="formData.attachments" @change="(val) => formData.attachments = val"/>
-        </el-form-item>
-        <!-- <el-form-item
+                <el-form-item label="服务事项" prop="serviceName" label-width="150px"
+                    :class="{ 'form-item': source === 'visiual' }" style="display: block">
+                    <el-input class="item_width_1" placeholder="请输入服务事项" v-model.trim="formData.serviceName">
+                    </el-input>
+                </el-form-item>
+
+                <el-form-item label="服务内容" prop="remark" label-width="150px" :class="{ 'form-item': source === 'visiual' }"
+                    style="display: block">
+                    <el-input class="item_width_1" type="textarea" maxlength="1000" show-word-limit :rows="3"
+                        placeholder="请输入备注，不超过1000字" v-model.trim="formData.remark"></el-input>
+                </el-form-item>
+                <el-form-item label="查找享受服务人员" prop="resiSearchTagId" :class="{ 'form-item': source === 'visiual' }"
+                    label-width="150px" style="display: block">
+                    <input type="text" v-model.trim="formData.resiSearchTagId" v-show="false" />
+                    <template style="margin-right: 10px" v-if="formData.resiSearchTagName">
+                        <el-tag @close="handleCloseTag" closable style="margin-right: 10px">
+                            {{ formData.resiSearchTagName }}
+                        </el-tag>
+                    </template>
+
+                    <el-button type="primary" @click="handleClickLabel" size="mini">
+                        <span> <i class="el-icon-plus"></i> 按标签查找 </span>
+                    </el-button>
+                </el-form-item>
+                <el-form-item label="服务组织" prop="serviceOrgId" label-width="150px"
+                    :class="{ 'form-item': source === 'visiual' }" style="display: block">
+                    <el-select v-model.trim="formData.serviceOrgType" class="input-width-small" placeholder="请选择" clearable
+                        @change="handleServiceChange('add', $event)">
+                        <el-option v-for="item in serviceOptions" :key="item.value" :label="item.label" :value="item.value">
+                        </el-option>
+                    </el-select>
+                    -
+                    <el-select v-model.trim="formData.serviceOrgId" class="input-width-middle" filterable placeholder="请选择"
+                        clearable>
+                        <el-option v-for="item in serviceOptiondList" :key="item.id" :label="item.label" :value="item.id">
+                        </el-option>
+                    </el-select>
+                </el-form-item>
+                <el-form-item prop="noticeApproches" label="自动通知服务组织" label-width="150px" style="display: block">
+                    <el-checkbox-group v-model.trim="formData.noticeApproches">
+                        <el-checkbox label="sms" value="sms">短信通知</el-checkbox>
+                        <el-checkbox label="wx_official_account" value="wx_official_account">微信公众号消息通知</el-checkbox>
+                    </el-checkbox-group>
+                </el-form-item>
+                <el-form-item label="服务范围" prop="gridIdList" label-width="150px"
+                    :class="{ 'form-item': source === 'visiual' }" style="display: block">
+                    <el-cascader class="item_width_1" ref="myCascader" v-model.trim="scopeIdArray" :key="iscascaderShow"
+                        :options="casOptions" :props="optionProps" :show-all-levels="false" collapse-tags
+                        @change="handleChangeScope"></el-cascader>
+                </el-form-item>
+
+                <el-form-item label="服务时间" label-width="150px" :class="{ 'form-item': source === 'visiual' }"
+                    prop="serviceTimeStart">
+                    <el-date-picker v-model.trim="formData.serviceTimeStart" :picker-options="startPickerOptions"
+                        class="item_width_2" style="width: 220px" type="date" value-format="yyyy-MM-dd HH:mm:ss"
+                        value="yyyy-MM-dd" placeholder="开始时间">
+                    </el-date-picker>
+                    <span class="u-data-tag">至</span>
+                    <el-date-picker v-model.trim="formData.serviceTimeEnd" :picker-options="endPickerOptions"
+                        class="item_width_2 u-data-tag" style="width: 220px" type="date" value-format="yyyy-MM-dd HH:mm:ss"
+                        value="yyyy-MM-dd" placeholder="结束时间">
+                    </el-date-picker>
+                </el-form-item>
+
+                <el-form-item label="经办人" prop="principalName" :class="{ 'form-item': source === 'visiual' }"
+                    label-width="150px" style="display: block">
+                    <el-input class="item_width_1" placeholder="请输入联系人姓名" v-model.trim="formData.principalName">
+                    </el-input>
+                </el-form-item>
+                <el-form-item label="联系方式" prop="principalContact" :class="{ 'form-item': source === 'visiual' }"
+                    label-width="150px" style="display: block">
+                    <el-input class="item_width_1" placeholder="请输入联系人电话" v-model.trim="formData.principalContact">
+                    </el-input>
+                </el-form-item>
+                <el-form-item label="服务状态" prop="serviceStatus" :class="{ 'form-item': source === 'visiual' }"
+                    label-width="150px" style="display: block">
+                    <el-select v-model.trim="formData.serviceStatus" placeholder="请选择">
+                        <el-option v-for="e in serviceStatusOptions" :key="e.value" :value="e.value"
+                            :label="e.label"></el-option>
+                    </el-select>
+                </el-form-item>
+                <el-form-item label="上传图片" label-width="150px" style="display: block" prop="attachments"
+                    v-if="formType === 'edit'">
+                    <UploadImages :fileList="formData.attachments" @change="(val) => formData.attachments = val" />
+                </el-form-item>
+                <!-- <el-form-item
           label="直接反馈"
           prop="remark"
           label-width="150px"
@@ -242,100 +118,50 @@
         >
           <el-checkbox
             :label="'是'"
-            v-model="showFeedback"
+            v-model.trim="showFeedback"
             @change="handleChangeFeedback"
           ></el-checkbox>
         </el-form-item> -->
-      </el-form>
-      <div v-show="formType === 'feedback' || showFeedback">
-        <!-- <h3 class="d-h3">反馈内容</h3> -->
-
-        <el-form
-          ref="ref_form_feedback"
-          :inline="true"
-          :model="feedbackFormData"
-          :rules="feedbackDataRule"
-          class="div_form"
-        >
-          <el-form-item
-            label="满意度"
-            style="display: block"
-            label-width="150px"
-            :class="{ 'form-item': source === 'visiual' }"
-            prop="satisfaction"
-          >
-            <el-select
-              class="item_width_2"
-              v-model="feedbackFormData.satisfaction"
-              placeholder="全部"
-              clearable
-            >
-              <el-option
-                v-for="item in satisfyArray"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-              >
-              </el-option>
-            </el-select>
-          </el-form-item>
-          <el-form-item
-            label="备注"
-            prop="serviceGoal"
-            :class="{ 'form-item': source === 'visiual' }"
-            label-width="150px"
-            style="display: block"
-          >
-            <el-input
-              class="item_width_1"
-              type="textarea"
-              maxlength="1000"
-              show-word-limit
-              :rows="3"
-              v-model="feedbackFormData.serviceGoal"
-            ></el-input>
-          </el-form-item>
-        </el-form>
-      </div>
-    </div>
-
-    <div class="div_btn">
-      <el-button size="small" @click="handleCancle">取 消</el-button>
-      <el-button
-        size="small"
-        type="primary"
-        :disabled="btnDisable"
-        @click="handleComfirm"
-        >确 定</el-button
-      >
-    </div>
-
-    <el-dialog
-      v-if="showLabelForm"
-      :visible.sync="showLabelForm"
-      :append-to-body="true"
-      :close-on-click-modal="false"
-      :close-on-press-escape="false"
-      :title="'标签配置'"
-      width="954px"
-      top="5vh"
-      class="dialog-h"
-      @closed="showLabelForm = false"
-    >
-      <label-form
-        ref="ref_label_form"
-        :ruleList="ruleList"
-        @dialogCancle="addFormCancle"
-        @dialogOk="addFormOk"
-      >
-        <!--    @handleOk="handleOk"
+            </el-form>
+            <div v-show="formType === 'feedback' || showFeedback">
+                <!-- <h3 class="d-h3">反馈内容</h3> -->
+
+                <el-form ref="ref_form_feedback" :inline="true" :model="feedbackFormData" :rules="feedbackDataRule"
+                    class="div_form">
+                    <el-form-item label="满意度" style="display: block" label-width="150px"
+                        :class="{ 'form-item': source === 'visiual' }" prop="satisfaction">
+                        <el-select class="item_width_2" v-model.trim="feedbackFormData.satisfaction" placeholder="全部" clearable>
+                            <el-option v-for="item in satisfyArray" :key="item.value" :label="item.label"
+                                :value="item.value">
+                            </el-option>
+                        </el-select>
+                    </el-form-item>
+                    <el-form-item label="备注" prop="serviceGoal" :class="{ 'form-item': source === 'visiual' }"
+                        label-width="150px" style="display: block">
+                        <el-input class="item_width_1" type="textarea" maxlength="1000" show-word-limit :rows="3"
+                            v-model.trim="feedbackFormData.serviceGoal"></el-input>
+                    </el-form-item>
+                </el-form>
+            </div>
+        </div>
+
+        <div class="div_btn">
+            <el-button size="small" @click="handleCancle">取 消</el-button>
+            <el-button size="small" type="primary" :disabled="btnDisable" @click="handleComfirm">确 定</el-button>
+        </div>
+
+        <el-dialog v-if="showLabelForm" :visible.sync="showLabelForm" :append-to-body="true" :close-on-click-modal="false"
+            :close-on-press-escape="false" :title="'标签配置'" width="954px" top="5vh" class="dialog-h"
+            @closed="showLabelForm = false">
+            <label-form ref="ref_label_form" :ruleList="ruleList" @dialogCancle="addFormCancle" @dialogOk="addFormOk">
+                <!--    @handleOk="handleOk"
           @handleClose="handleClose" -->
-      </label-form>
-    </el-dialog>
-  </div>
+            </label-form>
+        </el-dialog>
+    </div>
 </template>
   
-    <script>
+<script>
 import { mapGetters } from "vuex";
 import { Loading } from "element-ui"; // 引入Loading服务
 import { requestPost, requestGet } from "@/js/dai/request";
@@ -349,719 +175,722 @@ let loading; // 加载动画
 let map;
 
 export default {
-  props: {
-    defaultData: {
-      type: Object,
-      default: null,
-    },
-    serviceRecordId: {
-      type: String,
-      required: "",
-    },
-    serviceProjectName: {
-      //服务项目名称
-      type: String,
-      required: false,
-      default: "",
-    },
-    formType: {
-      //表单操作类型 add新增，edit编辑，detail详情,feedback反馈
-      type: String,
-      required: "",
-    },
-    categrayArray: {
-      type: Array,
-      default() {
-        return [];
-      },
-    },
-    source: {
-      //展示来源：manage  管理平台    visiual  可视化平台
-      type: String,
-      default: "manage",
-    },
-  },
-
-  data() {
-    let endDisabledDate = (time) => {
-      //这个关键属性我们一定要写在data的里面并且return的外面，这是动态改变区间的关键
-      let nowData = Date.now();
-      if (this.formData.serviceTimeStart) {
-        let serviceTimeStart = new Date(this.formData.serviceTimeStart);
-        return (
-          time.getTime() < serviceTimeStart- 24 * 60 * 60 * 1000 ||
-          time.getTime() === serviceTimeStart- 24 * 60 * 60 * 1000
-        );
-      } else {
-        return (time.getTime() > nowData || time.getTime() === nowData) ;
-      }
-    };
-    let startDisabledDate = (time) => {
-      //这个关键属性我们一定要写在data的里面并且return的外面，这是动态改变区间的关键
-      let nowData = Date.now() - 24 * 60 * 60 * 1000;
-      return time.getTime() < nowData;
-    };
-    return {
-    
-      btnDisable: false,
-      casOptions: [],
-      scopeIdArray: [],
-      iscascaderShow: 0,
-
-      optionProps: {
-        multiple: true,
-        value: "objectId",
-        label: "objectName",
-        children: "children",
-        checkStrictly: true,
-        emitPath: false,
-      },
-
-      keyWords: "",
-      formData: {
-        categoryCode:[],
-        parentCategoryCode:'',
-        resiSearchTagId: "", //查找享受服务人员
-        resiSearchTagName: "", //享受服务人员名称
-        serviceName: "", //服务事项
-        noticeApproches: [], //通知服务组织
-        policyId: "", //政策依据
-        serviceOrgType: "", //服务组织类型 社区自组织：community_org， 志愿者：ic_user_volunteer， 联建单位：party_unit
-        serviceOrgId: "", //服务组织Id
-        gridIdList: [], //
-        principalName: "", //经办人(责任人)姓名
-        principalContact: "", //经办人联系方式
-        serviceTimeStart: "", //服务起始时间yyyy-MM-dd
-        serviceTimeEnd: "", //服务截止时间yyyy-MM-dd
-        remark: "", //
-        attachments: []
-      },
-      feedbackFormData: {
-        serviceGoal: "", //	服务目标
-        serviceEffect: "", //	服务效果
-        servicePeopleNumber: null, //	服务人数
-        serviceStatus: "completed", //	服务状态。in_service服务中；completed:已完成
-        satisfaction: "", //满意度。不满意:bad、基本满意:good、非常满意:perfect
-        longitude: "", //	经度
-        latitude: "", //	维度
-        address: "",
-        fileList: [], //	附件列表
-      },
-      sarr: [],
-      dataRule: {
-        categoryCode: [
-          { required: true, message: "服务类别不能为空", trigger: "change" },
-        ],
-        serviceName: [
-          { required: true, message: "服务事项不能为空", trigger: "change" },
-        ],
-        serviceOrgId: [
-          { required: true, message: "服务组织不能为空", trigger: "change" },
-        ],
-
-        serviceTimeStart: [
-          { required: true, message: "服务时间不能为空", trigger: "change" },
-        ],
-        gridIdList: [
-          { required: true, message: "服务范围不能为空", trigger: "change" },
-        ],
-        resiSearchTagId: [
-          { required: true, message: "享受服务人员不能为空", trigger: "blur" },
-        ],
-      },
-
-      endPickerOptions: {
-        disabledDate: endDisabledDate,
-      },
-      startPickerOptions: {
-        disabledDate: startDisabledDate,
-      },
-
-      serviceOptions: [],
-      serviceOptiondList: [],
-      policyList: [],
-
-      fileList: [],
-      uploadUlr: window.SITE_CONFIG["apiURL"] + "/oss/file/uploadvariedfile",
-
-      showPersonList: false,
-      ruleList: [],
-      firstInitMap: true,
-
-      categrayOptions: [],
-      statusArray: [
-        {
-          value: "in_service",
-          label: "进行中",
+    props: {
+        defaultData: {
+            type: Object,
+            default: null,
         },
-        {
-          value: "completed",
-          label: "已完成",
+        serviceRecordId: {
+            type: String,
+            required: "",
         },
-      ],
-      satisfyArray: [
-        {
-          value: "bad",
-          label: "不满意",
+        serviceProjectName: {
+            //服务项目名称
+            type: String,
+            required: false,
+            default: "",
         },
-        {
-          value: "good",
-          label: "基本满意",
+        formType: {
+            //表单操作类型 add新增，edit编辑，detail详情,feedback反馈
+            type: String,
+            required: "",
         },
-        {
-          value: "perfect",
-          label: "非常满意",
+        categrayArray: {
+            type: Array,
+            default() {
+                return [];
+            },
+        },
+        source: {
+            //展示来源：manage  管理平台    visiual  可视化平台
+            type: String,
+            default: "manage",
         },
-      ],
-      showLabelForm: false,
-      showFeedback: false,
-      demandOptions:[]
-    };
-  },
-
-  computed: {
-    feedbackDataRule() {
-      return {
-        // serviceGoal: [
-        //   { required: true, message: "服务目标不能为空", trigger: "blur" },
-        // ],
-
-        serviceEffect: [
-          { required: true, message: "服务效果不能为空", trigger: "blur" },
-        ],
-        servicePeopleNumber: [
-          { required: true, message: "服务人数不能为空", trigger: "blur" },
-        ],
-        serviceStatus: [
-          { required: true, message: "服务状态不能为空", trigger: "blur" },
-        ],
-        satisfaction: [
-          { required: true, message: "满意度不能为空", trigger: "blur" },
-        ],
-        address: [{ required: true, message: "地址不能为空", trigger: "blur" }],
-      };
-    },
-  },
-
-  watch: {
-    "formData.serviceTimeEnd": function (val) {
-      if (val && val != "") {
-        let arrayTemp = val.split(" ");
-        this.formData.serviceTimeEnd = arrayTemp[0] + " 23:59:59";
-      }
-    },
-  },
-
-  components: { labelForm,UploadImages },
-
-  async mounted() {
-    this.startLoading();
-    // 都已经重置了，还放在prop里干嘛，我不理解
-    this.categrayOptions = this.categrayArray;
-
-    // this.getCategrayList();
-    this.getDictOptions();
-    this.getPolicyList();
-    await this.loadScopeTree();
-    if (this.formType === "add") {
-      this.$refs.ref_form.resetFields();
-    } else if (this.formType == "edit") {
-      this.loadInfo();
-    }
-
-    await this.iniDefaultData();
-    await this.getDemandOptions()
-    this.endLoading();
-    // 服务分类下拉（其实是获取的共性服务分类）
-  },
-
-  methods: {
-    async getDemandOptions() {
-      this.$http
-        .post("/actual/base/serviceitem/listAllCategory")
-        .then(({ data: res }) => {
-          if (res.code !== 0) {
-            return this.$message.error(res.msg);
-          } else {
-            this.demandOptions = this.getFlagData(
-              this.getTreeData(res.data),
-              "usableFlag"
-            ).filter((item) => item.categoryCode == '1044');
-          }
-        })
-        .catch(() => {
-          return this.$message.error("网络错误");
-        });
-    },
-    getFlagData(data, flag) {
-      if (!Array.isArray(data)) return [];
-      let arr1 = data.filter((item) => item[flag]);
-      let arr2 = arr1.map((item) => {
-        if (item.childCateList)
-          return { ...item, childCateList: this.getFlagData(item.childCateList, flag) };
-        else return item;
-      });
-      // console.log('arrr-oppp', arr2)
-      return arr2;
-    },
-    getTreeData(data) {
-      if (!Array.isArray(data)) return [];
-      let arr = data.map((item) => {
-        let _item = {};
-        if (item.childCateList) {
-          if (item.childCateList.length === 0)
-            _item = { ...item, childCateList: undefined };
-          else _item = { ...item, childCateList: this.getTreeData(item.childCateList) };
-        } else {
-          _item = { ...item };
-        }
-        return _item;
-      });
-      return arr;
-    },
-    handelDisabledRules(v) {
-      if (!v) {
-        delete this.dataRule.resiSearchTagId;
-      } else {
-        var arr = [
-          {
-            required: true,
-            message: "享受服务人员不能为空",
-            trigger: "change",
-          },
-        ];
-        this.dataRule.resiSearchTagId = arr;
-      }
-      console.log(this.dataRule);
-    },
-    //获取服务详情数据
-    async loadInfo() {
-      const url = "/governance/icServicePostRecord/detail";
-      let params = {
-        serviceRecordId: this.serviceRecordId,
-      };
-
-      const { data, code, msg } = await requestPost(url, params);
-
-      if (code === 0) {
-        this.formData = { ...data };
-        if (data.categoryCode) {
-          this.formData.categoryCode = [data.parentCategoryCode, data.categoryCode];
-        } else {
-          this.formData.categoryCode = [data.parentCategoryCode];
-        }
-        if(!data.noticeApproches){
-          this.formData.noticeApproches = [];
-        }
-        this.scopeIdArray = data.gridIdList.map(i => i.objectId);
-        this.feedbackFormData = { ...data.feedback };
-        await this.getServiceuserList(data.serviceOrgType);
-        await this.getTagName();
-        // this.fileList = []
-        // if (data.feedback && data.feedback.fileList && data.feedback.fileList.length > 0) {
-        //   data.feedback.fileList.forEach(element => {
-        //     let obj = {
-        //       name: element.name,
-        //       format: element.format,
-        //       url: element.url,
-        //     }
-        //     this.fileList.push(obj)
-        //   });
-        // }
-      } else {
-        this.$message.error(msg);
-      }
-    },
-    async getTagName() {
-      const url = "/governance/resiSearchTag/listResiSearchTags";
-      let params = {
-        pageSize: 99,
-      };
-      let { data, msg, code } = await requestPost(url, params);
-      if (code == 0) {
-        let showAddProduct = data.list.filter((item) => {
-          return [this.formData.resiSearchTagId].includes(item.tagId);
-        });
-        this.formData.resiSearchTagName = showAddProduct[0].tagName;
-      } else {
-        this.$message.error(msg);
-      }
-    },
-    handleClickLabel() {
-      this.showLabelForm = true;
-      this.$nextTick(() => {
-        this.$refs["ref_label_form"].initForm("info");
-      });
-    },
-    addFormOk(val) {
-      this.showLabelForm = false;
-      this.formData.resiSearchTagId = val.tagId;
-      this.formData.resiSearchTagName = val.tagName;
-    },
-    addFormCancle() {
-      this.showLabelForm = false;
-    },
-    handleCloseTag() {
-      this.formData.resiSearchTagId = "";
-      this.formData.resiSearchTagName = "";
-    },
-    getLastItem(list, vals, key) {
-      console.log(list, vals, key);
-      let LIST = list || [];
-      for (let item of LIST) {
-        for (let i of vals) {
-          if (item[key] === i) {
-            this.sarr.push(item);
-          } else if (item["objectType"] == "district") {
-            this.getLastItem(item.children, vals, key);
-          } else {
-            this.getLastItem(item.children, vals, key);
-          }
-        }
-      }
-    },
-    async handleTreeList() {
-      const map = new Map();
-      await this.getLastItem(this.casOptions, this.scopeIdArray, "objectId");
-      let temp = [];
-      //递归出的数据会有重复,因为一个街道下面有两个社区的话就会循环push两遍,在这里去重
-      temp = this.sarr.filter(
-        (v) => !map.has(v.objectId) && map.set(v.objectId, 1)
-      );
-      for (let i in temp) {
-        this.scopeIdArray.push({
-          objectId: temp[i].objectId,
-          objectType: temp[i].objectType,
-          objectName: temp[i].objectName,
-        });
-      }
-      temp = [];
-      //  如果是编辑的话回填的数据会有数组字符串需要将不是对象属性的过滤掉
-      let arr = [];
-      // let isOk = false;
-      this.scopeIdArray.forEach((item) => {
-        if (typeof item != "string") {
-          arr.push(item);
-        }
-      });
-      return arr;
-    },
-    handleChangeFeedback(val) {
-      this.showFeedback = val;
-
-      // if (this.firstInitMap) {
-      //   this.$nextTick(() => {
-      //     this.initMap();
-      //   });
-      // }
-    },
-    async iniDefaultData() {
-      const { defaultData } = this;
-      if (defaultData) {
-        const { serviceOrgType, serviceOrgId, scopeIdArray } = defaultData;
-        if (serviceOrgType) {
-          this.formData.serviceOrgType = serviceOrgType;
-          await this.getServiceuserList(serviceOrgType, "add_demand");
-        }
-        if (serviceOrgId) {
-          this.formData.serviceOrgId = serviceOrgId;
-        }
-        if (scopeIdArray) {
-          this.scopeIdArray = scopeIdArray;
-          await nextTick();
-          this.handleChangeScope();
-        }
-      }
     },
 
-    handleClose() {
-      this.showPersonList = false;
-    },
-    handleOk() {
-      this.showPersonList = false;
+    data() {
+        let endDisabledDate = (time) => {
+            //这个关键属性我们一定要写在data的里面并且return的外面，这是动态改变区间的关键
+            let nowData = Date.now();
+            if (this.formData.serviceTimeStart) {
+                let serviceTimeStart = new Date(this.formData.serviceTimeStart);
+                return (
+                    time.getTime() < serviceTimeStart - 24 * 60 * 60 * 1000 ||
+                    time.getTime() === serviceTimeStart - 24 * 60 * 60 * 1000
+                );
+            } else {
+                return (time.getTime() > nowData || time.getTime() === nowData);
+            }
+        };
+        let startDisabledDate = (time) => {
+            //这个关键属性我们一定要写在data的里面并且return的外面，这是动态改变区间的关键
+            let nowData = Date.now() - 24 * 60 * 60 * 1000;
+            return time.getTime() < nowData;
+        };
+        return {
+
+            btnDisable: false,
+            casOptions: [],
+            scopeIdArray: [],
+            iscascaderShow: 0,
+
+            optionProps: {
+                multiple: true,
+                value: "objectId",
+                label: "objectName",
+                children: "children",
+                checkStrictly: true,
+                emitPath: false,
+            },
+            serviceStatusOptions: [{ 'label': '进行中', 'value': 'in_service' }, { 'label': '已完成', 'value': 'completed' }, { 'label': '取消', 'value': 'cancel' }],
+            keyWords: "",
+            formData: {
+                categoryCode: [],
+                parentCategoryCode: '',
+                resiSearchTagId: "", //查找享受服务人员
+                resiSearchTagName: "", //享受服务人员名称
+                serviceName: "", //服务事项
+                noticeApproches: [], //通知服务组织
+                policyId: "", //政策依据
+                serviceOrgType: "", //服务组织类型 社区自组织：community_org， 志愿者：ic_user_volunteer， 联建单位：party_unit
+                serviceOrgId: "", //服务组织Id
+                gridIdList: [], //
+                principalName: "", //经办人(责任人)姓名
+                principalContact: "", //经办人联系方式
+                serviceTimeStart: "", //服务起始时间yyyy-MM-dd
+                serviceTimeEnd: "", //服务截止时间yyyy-MM-dd
+                serviceStatus: "", //服务状态 in_service服务中；completed:已完成；cancel：取消
+                remark: "", //
+                attachments: []
+            },
+            feedbackFormData: {
+                serviceGoal: "", //	服务目标
+                serviceEffect: "", //	服务效果
+                servicePeopleNumber: null, //	服务人数
+                serviceStatus: "completed", //	服务状态。in_service服务中；completed:已完成
+                satisfaction: "", //满意度。不满意:bad、基本满意:good、非常满意:perfect
+                longitude: "", //	经度
+                latitude: "", //	维度
+                address: "",
+                fileList: [], //	附件列表
+            },
+            sarr: [],
+            dataRule: {
+                categoryCode: [
+                    { required: true, message: "服务类别不能为空", trigger: "change" },
+                ],
+                serviceName: [
+                    { required: true, message: "服务事项不能为空", trigger: "change" },
+                ],
+                serviceOrgId: [
+                    { required: true, message: "服务组织不能为空", trigger: "change" },
+                ],
+
+                serviceTimeStart: [
+                    { required: true, message: "服务时间不能为空", trigger: "change" },
+                ],
+                gridIdList: [
+                    { required: true, message: "服务范围不能为空", trigger: "change" },
+                ],
+                resiSearchTagId: [
+                    { required: true, message: "享受服务人员不能为空", trigger: "blur" },
+                ],
+            },
+
+            endPickerOptions: {
+                disabledDate: endDisabledDate,
+            },
+            startPickerOptions: {
+                disabledDate: startDisabledDate,
+            },
+
+            serviceOptions: [],
+            serviceOptiondList: [],
+            policyList: [],
+
+            fileList: [],
+            uploadUlr: window.SITE_CONFIG["apiURL"] + "/oss/file/uploadvariedfile",
+
+            showPersonList: false,
+            ruleList: [],
+            firstInitMap: true,
+
+            categrayOptions: [],
+            statusArray: [
+                {
+                    value: "in_service",
+                    label: "进行中",
+                },
+                {
+                    value: "completed",
+                    label: "已完成",
+                },
+            ],
+            satisfyArray: [
+                {
+                    value: "bad",
+                    label: "不满意",
+                },
+                {
+                    value: "good",
+                    label: "基本满意",
+                },
+                {
+                    value: "perfect",
+                    label: "非常满意",
+                },
+            ],
+            showLabelForm: false,
+            showFeedback: false,
+            demandOptions: []
+        };
     },
 
-    async getPolicyList() {
-      const url = "/governance/policy/policyList";
-
-      let params = {};
-
-      const { data, code, msg } = await requestPost(url, params);
-
-      if (code === 0) {
-        this.policyList = data;
-      } else {
-        this.$message.error(msg);
-      }
+    computed: {
+        feedbackDataRule() {
+            return {
+                // serviceGoal: [
+                //   { required: true, message: "服务目标不能为空", trigger: "blur" },
+                // ],
+
+                serviceEffect: [
+                    { required: true, message: "服务效果不能为空", trigger: "blur" },
+                ],
+                servicePeopleNumber: [
+                    { required: true, message: "服务人数不能为空", trigger: "blur" },
+                ],
+                serviceStatus: [
+                    { required: true, message: "服务状态不能为空", trigger: "blur" },
+                ],
+                satisfaction: [
+                    { required: true, message: "满意度不能为空", trigger: "blur" },
+                ],
+                address: [{ required: true, message: "地址不能为空", trigger: "blur" }],
+            };
+        },
     },
 
-    async getDictOptions() {
-      this.$http
-        .post("/sys/dict/data/dictlist", {
-          dictType: "user_demand_service_type",
-        })
-        .then(({ data: res }) => {
-          if (res.code !== 0) {
-            return this.$message.error(res.msg);
-          } else {
-            this.serviceOptions =  res.data.filter(item=>item.value == 'party_unit'||item.value == 'community_org');
-          }
-        })
-        .catch(() => {
-          return this.$message.error("网络错误");
-        });
+    watch: {
+        "formData.serviceTimeEnd": function (val) {
+            if (val && val != "") {
+                let arrayTemp = val.split(" ");
+                this.formData.serviceTimeEnd = arrayTemp[0] + " 23:59:59";
+            }
+        },
     },
 
-    // 字典
-    // async getCategrayList() {
-    //   const url = "/sys/dict/data/dictlist";
-
-    //   let params = {
-    //     dictType: "ic_service_type",
-    //   };
+    components: { labelForm, UploadImages },
 
-    //   const { data, code, msg } = await requestPost(url, params);
+    async mounted() {
+        this.startLoading();
+        // 都已经重置了，还放在prop里干嘛，我不理解
+        this.categrayOptions = this.categrayArray;
 
-    //   if (code === 0) {
-    //     this.categrayOptions = data;
-    //   } else {
-    //     this.$message.error(msg);
-    //   }
-    // },
-    async handleServiceChange(type, val) {
-      if (val === "social_org") {
-        if (type === "add") await this.getServiceuserList(val);
-        else this.getServiceuserList(val);
-      } else this.getServiceuserList(val);
-    },
+        // this.getCategrayList();
+        this.getDictOptions();
+        this.getPolicyList();
+        await this.loadScopeTree();
+        if (this.formType === "add") {
+            this.$refs.ref_form.resetFields();
+        } else if (this.formType == "edit") {
+            this.loadInfo();
+        }
 
-    async getServiceuserList(serverOrgType) {
-      if (!serverOrgType) return false;
-      if (this.formData.categoryCode.length === 0) {
-        this.$message.error("请先选择服务类别!");
-        return;
-      }
-      const url = "/actual/base/serviceitem/listServerOrgNewTask";
-      let params = {
-        serverOrgCategoryCode: this.formData.categoryCode[1],
-        serverParentOrgCategoryCode:this.formData.categoryCode[0],
-        serverOrgType: serverOrgType,
-      };
-      let { data, code, msg } = await requestPost(url, params);
-      if (code == 0) {
-        this.serviceOptiondList = data;
-      } else if (code >= 8000) {
-        this.$message.error(msg);
-      }
-    },
+        await this.iniDefaultData();
+        await this.getDemandOptions()
+        this.endLoading();
+        // 服务分类下拉（其实是获取的共性服务分类）
+    },
+
+    methods: {
+        async getDemandOptions() {
+            this.$http
+                .post("/actual/base/serviceitem/listAllCategory")
+                .then(({ data: res }) => {
+                    if (res.code !== 0) {
+                        return this.$message.error(res.msg);
+                    } else {
+                        this.demandOptions = this.getFlagData(
+                            this.getTreeData(res.data),
+                            "usableFlag"
+                        ).filter((item) => item.categoryCode == '1044');
+                    }
+                })
+                .catch(() => {
+                    return this.$message.error("网络错误");
+                });
+        },
+        getFlagData(data, flag) {
+            if (!Array.isArray(data)) return [];
+            let arr1 = data.filter((item) => item[flag]);
+            let arr2 = arr1.map((item) => {
+                if (item.childCateList)
+                    return { ...item, childCateList: this.getFlagData(item.childCateList, flag) };
+                else return item;
+            });
+            // console.log('arrr-oppp', arr2)
+            return arr2;
+        },
+        getTreeData(data) {
+            if (!Array.isArray(data)) return [];
+            let arr = data.map((item) => {
+                let _item = {};
+                if (item.childCateList) {
+                    if (item.childCateList.length === 0)
+                        _item = { ...item, childCateList: undefined };
+                    else _item = { ...item, childCateList: this.getTreeData(item.childCateList) };
+                } else {
+                    _item = { ...item };
+                }
+                return _item;
+            });
+            return arr;
+        },
+        handelDisabledRules(v) {
+            if (!v) {
+                delete this.dataRule.resiSearchTagId;
+            } else {
+                var arr = [
+                    {
+                        required: true,
+                        message: "享受服务人员不能为空",
+                        trigger: "change",
+                    },
+                ];
+                this.dataRule.resiSearchTagId = arr;
+            }
+            console.log(this.dataRule);
+        },
+        //获取服务详情数据
+        async loadInfo() {
+            const url = "/governance/icServicePostRecord/detail";
+            let params = {
+                serviceRecordId: this.serviceRecordId,
+            };
+
+            const { data, code, msg } = await requestPost(url, params);
+
+            if (code === 0) {
+                this.formData = { ...data };
+                if (data.categoryCode) {
+                    this.formData.categoryCode = [data.parentCategoryCode, data.categoryCode];
+                } else {
+                    this.formData.categoryCode = [data.parentCategoryCode];
+                }
+                if (!data.noticeApproches) {
+                    this.formData.noticeApproches = [];
+                }
+                this.scopeIdArray = data.gridIdList.map(i => i.objectId);
+                this.feedbackFormData = { ...data.feedback };
+                await this.getServiceuserList(data.serviceOrgType);
+                await this.getTagName();
+                // this.fileList = []
+                // if (data.feedback && data.feedback.fileList && data.feedback.fileList.length > 0) {
+                //   data.feedback.fileList.forEach(element => {
+                //     let obj = {
+                //       name: element.name,
+                //       format: element.format,
+                //       url: element.url,
+                //     }
+                //     this.fileList.push(obj)
+                //   });
+                // }
+            } else {
+                this.$message.error(msg);
+            }
+        },
+        async getTagName() {
+            const url = "/governance/resiSearchTag/listResiSearchTags";
+            let params = {
+                pageSize: 99,
+            };
+            let { data, msg, code } = await requestPost(url, params);
+            if (code == 0) {
+                let showAddProduct = data.list.filter((item) => {
+                    return [this.formData.resiSearchTagId].includes(item.tagId);
+                });
+                this.formData.resiSearchTagName = showAddProduct[0].tagName;
+            } else {
+                this.$message.error(msg);
+            }
+        },
+        handleClickLabel() {
+            this.showLabelForm = true;
+            this.$nextTick(() => {
+                this.$refs["ref_label_form"].initForm("info");
+            });
+        },
+        addFormOk(val) {
+            this.showLabelForm = false;
+            this.formData.resiSearchTagId = val.tagId;
+            this.formData.resiSearchTagName = val.tagName;
+        },
+        addFormCancle() {
+            this.showLabelForm = false;
+        },
+        handleCloseTag() {
+            this.formData.resiSearchTagId = "";
+            this.formData.resiSearchTagName = "";
+        },
+        getLastItem(list, vals, key) {
+            console.log(list, vals, key);
+            let LIST = list || [];
+            for (let item of LIST) {
+                for (let i of vals) {
+                    if (item[key] === i) {
+                        this.sarr.push(item);
+                    } else if (item["objectType"] == "district") {
+                        this.getLastItem(item.children, vals, key);
+                    } else {
+                        this.getLastItem(item.children, vals, key);
+                    }
+                }
+            }
+        },
+        async handleTreeList() {
+            const map = new Map();
+            await this.getLastItem(this.casOptions, this.scopeIdArray, "objectId");
+            let temp = [];
+            //递归出的数据会有重复,因为一个街道下面有两个社区的话就会循环push两遍,在这里去重
+            temp = this.sarr.filter(
+                (v) => !map.has(v.objectId) && map.set(v.objectId, 1)
+            );
+            for (let i in temp) {
+                this.scopeIdArray.push({
+                    objectId: temp[i].objectId,
+                    objectType: temp[i].objectType,
+                    objectName: temp[i].objectName,
+                });
+            }
+            temp = [];
+            //  如果是编辑的话回填的数据会有数组字符串需要将不是对象属性的过滤掉
+            let arr = [];
+            // let isOk = false;
+            this.scopeIdArray.forEach((item) => {
+                if (typeof item != "string") {
+                    arr.push(item);
+                }
+            });
+            return arr;
+        },
+        handleChangeFeedback(val) {
+            this.showFeedback = val;
+
+            // if (this.firstInitMap) {
+            //   this.$nextTick(() => {
+            //     this.initMap();
+            //   });
+            // }
+        },
+        async iniDefaultData() {
+            const { defaultData } = this;
+            if (defaultData) {
+                const { serviceOrgType, serviceOrgId, scopeIdArray } = defaultData;
+                if (serviceOrgType) {
+                    this.formData.serviceOrgType = serviceOrgType;
+                    await this.getServiceuserList(serviceOrgType, "add_demand");
+                }
+                if (serviceOrgId) {
+                    this.formData.serviceOrgId = serviceOrgId;
+                }
+                if (scopeIdArray) {
+                    this.scopeIdArray = scopeIdArray;
+                    await nextTick();
+                    this.handleChangeScope();
+                }
+            }
+        },
 
-    // 获取服务范围树
-    async loadScopeTree() {
-      const url = "/gov/org/icServiceProject/service/serviceScopeTree";
-      // const url = 'http://yapi.elinkservice.cn/mock/245/gov/org/isServiceProject/service/serviceScopeTree'
-      let params = {};
+        handleClose() {
+            this.showPersonList = false;
+        },
+        handleOk() {
+            this.showPersonList = false;
+        },
 
-      const { data, code, msg } = await requestPost(url, params);
+        async getPolicyList() {
+            const url = "/governance/policy/policyList";
 
-      if (code === 0) {
-        ++this.iscascaderShow;
-        this.casOptions = [];
-        this.scopeIdArray = [];
-        this.casOptions.push(data);
-      } else {
-        this.$message.error(rspMsg);
-      }
-    },
+            let params = {};
 
-    handleChangeScope(value) {
-      this.formData.gridIdList = [];
-      let selArray = this.$refs["myCascader"].getCheckedNodes();
-      console.log("handleChangeScope", selArray);
-      selArray.forEach((element) => {
-        let obj = {
-          objectType: element.data.objectType,
-          objectId: element.data.objectId,
-          objectName: element.data.objectName,
-        };
-        this.formData.gridIdList.push(obj);
-      });
-    },
+            const { data, code, msg } = await requestPost(url, params);
 
-    async handleComfirm() {
-      if (this.formType === "add") {
-        this.handleAdd();
-      } else if (this.formType === "feedback") {
-        this.handleFeedback();
-      } else if (this.formType === "edit") {
-        this.handleAdd();
-      }
-    },
+            if (code === 0) {
+                this.policyList = data;
+            } else {
+                this.$message.error(msg);
+            }
+        },
 
-    async handleAdd() {
-      this.btnDisable = true;
-      setTimeout(() => {
-        this.btnDisable = false;
-      }, 10000);
-      this.formData.gridIdList = await this.handleTreeList();
-      this.$refs["ref_form"].validate((valid, messageObj) => {
-        if (!valid) {
-          app.util.validateRule(messageObj);
-          this.btnDisable = false;
-        } else {
-          var oDate1 = new Date(this.formData.serviceTimeStart);
-          var oDate2 = new Date(this.formData.serviceTimeEnd);
-          if (oDate1.getTime() > oDate2.getTime()) {
-            this.$message.error("服务截止时间必须大于服务开始时间");
-            return false;
-          }
-          this.addFuwu();
-        }
-      });
-    },
-    async handleFeedback() {
-      this.btnDisable = true;
-      setTimeout(() => {
-        this.btnDisable = false;
-      }, 10000);
+        async getDictOptions() {
+            this.$http
+                .post("/sys/dict/data/dictlist", {
+                    dictType: "user_demand_service_type",
+                })
+                .then(({ data: res }) => {
+                    if (res.code !== 0) {
+                        return this.$message.error(res.msg);
+                    } else {
+                        this.serviceOptions = res.data.filter(item => item.value == 'party_unit' || item.value == 'community_org');
+                    }
+                })
+                .catch(() => {
+                    return this.$message.error("网络错误");
+                });
+        },
 
-      this.$refs["ref_form_feedback"].validate((valid, messageObj) => {
-        if (!valid) {
-          app.util.validateRule(messageObj);
-          this.btnDisable = false;
-        } else {
-          this.addFeecback();
-        }
-      });
-    },
-    async addFeecback() {
-      // this.feedbackFormData.fileList = [];
-      // this.feedbackFormData.fileList = [...this.fileList];
-      this.feedbackFormData.serviceRecordId = this.serviceRecordId;
+        // 字典
+        // async getCategrayList() {
+        //   const url = "/sys/dict/data/dictlist";
+
+        //   let params = {
+        //     dictType: "ic_service_type",
+        //   };
+
+        //   const { data, code, msg } = await requestPost(url, params);
+
+        //   if (code === 0) {
+        //     this.categrayOptions = data;
+        //   } else {
+        //     this.$message.error(msg);
+        //   }
+        // },
+        async handleServiceChange(type, val) {
+            if (val === "social_org") {
+                if (type === "add") await this.getServiceuserList(val);
+                else this.getServiceuserList(val);
+            } else this.getServiceuserList(val);
+        },
 
-      console.log(this.feedbackFormData);
+        async getServiceuserList(serverOrgType) {
+            if (!serverOrgType) return false;
+            if (this.formData.categoryCode.length === 0) {
+                this.$message.error("请先选择服务类别!");
+                return;
+            }
+            const url = "/actual/base/serviceitem/listServerOrgNewTask";
+            let params = {
+                serverOrgCategoryCode: this.formData.categoryCode[1],
+                serverParentOrgCategoryCode: this.formData.categoryCode[0],
+                serverOrgType: serverOrgType,
+            };
+            let { data, code, msg } = await requestPost(url, params);
+            if (code == 0) {
+                this.serviceOptiondList = data;
+            } else if (code >= 8000) {
+                this.$message.error(msg);
+            }
+        },
 
-      const url = "/governance/icServiceFeedbackV2/add";
-      let params = {
-        ...this.feedbackFormData,
-      };
+        // 获取服务范围树
+        async loadScopeTree() {
+            const url = "/gov/org/icServiceProject/service/serviceScopeTree";
+            // const url = 'http://yapi.elinkservice.cn/mock/245/gov/org/isServiceProject/service/serviceScopeTree'
+            let params = {};
+
+            const { data, code, msg } = await requestPost(url, params);
+
+            if (code === 0) {
+                ++this.iscascaderShow;
+                this.casOptions = [];
+                this.scopeIdArray = [];
+                this.casOptions.push(data);
+            } else {
+                this.$message.error(rspMsg);
+            }
+        },
 
-      const { data, code, msg } = await requestPost(url, params);
+        handleChangeScope(value) {
+            this.formData.gridIdList = [];
+            let selArray = this.$refs["myCascader"].getCheckedNodes();
+            console.log("handleChangeScope", selArray);
+            selArray.forEach((element) => {
+                let obj = {
+                    objectType: element.data.objectType,
+                    objectId: element.data.objectId,
+                    objectName: element.data.objectName,
+                };
+                this.formData.gridIdList.push(obj);
+            });
+        },
 
-      if (code === 0) {
-        this.$message.success("反馈成功");
-        this.resetData();
-        this.$emit("handleOk");
-      } else {
-        this.$message.error(msg);
-      }
-    },
-    async addFuwu() {
-      if (this.showFeedback) {
-        this.formData.feedback = { ...this.feedbackFormData };
-      } else {
-        this.formData.feedback = null;
-      }
-      let params = {
-        categoryCode:this.formData.categoryCode[1]?this.formData.categoryCode[1]:'',
-        parentCategoryCode:this.formData.categoryCode[0],
-        resiSearchTagId: this.formData.resiSearchTagId,
-        resiSearchTagName: this.formData.resiSearchTagName,
-        serviceName: this.formData.serviceName,
-        noticeApproches: this.formData.noticeApproches,
-        policyId: this.formData.policyId,
-        serviceOrgType: this.formData.serviceOrgType,
-        serviceOrgId: this.formData.serviceOrgId,
-        objList: this.formData.gridIdList,
-        principalName: this.formData.principalName,
-        principalContact: this.formData.principalContact,
-        serviceTimeStart: this.formData.serviceTimeStart,
-        serviceTimeEnd: this.formData.serviceTimeEnd,
-        remark: this.formData.remark,
-        feedback:this.formData.feedback,
-        serviceRecordId:this.serviceRecordId
-      };
-      let url = "";
-      if (this.formType != "edit") {
-        url = "/governance/icServicePostRecord/searchAdd";
-      } else {
-        url = "/governance/icServicePostRecord/searchUpdate";
-        params.attachments = this.formData.attachments
-      }
-      // const url = 'http://yapi.elinkservice.cn/mock/245/governance/icServiceProject/service/initiate'
+        async handleComfirm() {
+            if (this.formType === "add") {
+                this.handleAdd();
+            } else if (this.formType === "feedback") {
+                this.handleFeedback();
+            } else if (this.formType === "edit") {
+                this.handleAdd();
+            }
+        },
 
-      delete params.serviceTypeLevel1Id;
-      const { data, code, msg } = await requestPost(url, params);
-      if (code === 0) {
-        this.$message.success("发起成功");
-        this.resetData();
-        this.$emit("handleOk");
-      } else {
-        this.$message.error(msg);
-      }
-    },
+        async handleAdd() {
+            this.btnDisable = true;
+            setTimeout(() => {
+                this.btnDisable = false;
+            }, 10000);
+            this.formData.gridIdList = await this.handleTreeList();
+            this.$refs["ref_form"].validate((valid, messageObj) => {
+                if (!valid) {
+                    app.util.validateRule(messageObj);
+                    this.btnDisable = false;
+                } else {
+                    var oDate1 = new Date(this.formData.serviceTimeStart);
+                    var oDate2 = new Date(this.formData.serviceTimeEnd);
+                    if (oDate1.getTime() > oDate2.getTime()) {
+                        this.$message.error("服务截止时间必须大于服务开始时间");
+                        return false;
+                    }
+                    this.addFuwu();
+                }
+            });
+        },
+        async handleFeedback() {
+            this.btnDisable = true;
+            setTimeout(() => {
+                this.btnDisable = false;
+            }, 10000);
+
+            this.$refs["ref_form_feedback"].validate((valid, messageObj) => {
+                if (!valid) {
+                    app.util.validateRule(messageObj);
+                    this.btnDisable = false;
+                } else {
+                    this.addFeecback();
+                }
+            });
+        },
+        async addFeecback() {
+            // this.feedbackFormData.fileList = [];
+            // this.feedbackFormData.fileList = [...this.fileList];
+            this.feedbackFormData.serviceRecordId = this.serviceRecordId;
+
+            console.log(this.feedbackFormData);
+
+            const url = "/governance/icServiceFeedbackV2/add";
+            let params = {
+                ...this.feedbackFormData,
+            };
+
+            const { data, code, msg } = await requestPost(url, params);
+
+            if (code === 0) {
+                this.$message.success("反馈成功");
+                this.resetData();
+                this.$emit("handleOk");
+            } else {
+                this.$message.error(msg);
+            }
+        },
+        async addFuwu() {
+            if (this.showFeedback) {
+                this.formData.feedback = { ...this.feedbackFormData };
+            } else {
+                this.formData.feedback = null;
+            }
+            let params = {
+                categoryCode: this.formData.categoryCode[1] ? this.formData.categoryCode[1] : '',
+                parentCategoryCode: this.formData.categoryCode[0],
+                resiSearchTagId: this.formData.resiSearchTagId,
+                resiSearchTagName: this.formData.resiSearchTagName,
+                serviceName: this.formData.serviceName,
+                noticeApproches: this.formData.noticeApproches,
+                policyId: this.formData.policyId,
+                serviceOrgType: this.formData.serviceOrgType,
+                serviceOrgId: this.formData.serviceOrgId,
+                objList: this.formData.gridIdList,
+                principalName: this.formData.principalName,
+                principalContact: this.formData.principalContact,
+                serviceTimeStart: this.formData.serviceTimeStart,
+                serviceTimeEnd: this.formData.serviceTimeEnd,
+                serviceStatus: this.formData.serviceStatus,
+                remark: this.formData.remark,
+                feedback: this.formData.feedback,
+                serviceRecordId: this.serviceRecordId
+            };
+            let url = "";
+            if (this.formType != "edit") {
+                url = "/governance/icServicePostRecord/searchAdd";
+            } else {
+                url = "/governance/icServicePostRecord/searchUpdate";
+                params.attachments = this.formData.attachments
+            }
+            // const url = 'http://yapi.elinkservice.cn/mock/245/governance/icServiceProject/service/initiate'
+
+            delete params.serviceTypeLevel1Id;
+            const { data, code, msg } = await requestPost(url, params);
+            if (code === 0) {
+                this.$message.success("发起成功");
+                this.resetData();
+                this.$emit("handleOk");
+            } else {
+                this.$message.error(msg);
+            }
+        },
 
-    handleCancle() {
-      this.resetData();
-      this.$emit("handleClose");
-    },
+        handleCancle() {
+            this.resetData();
+            this.$emit("handleClose");
+        },
 
-    resetData() {
-      this.formData = {
-        categoryCode:[],
-        parentCategoryCode:'',
-        gridIdList: [], //
-        principalName: "", //经办人(责任人)姓名
-        principalContact: "", //经办人联系方式
-        serviceTimeStart: "", //服务起始时间yyyy-MM-dd
-        serviceTimeEnd: "", //服务截止时间yyyy-MM-dd
-        remark: "", //
-      };
-      this.feedbackFormData = {
-        serviceGoal: "", //	服务目标
-        serviceEffect: "", //	服务效果
-        servicePeopleNumber: null, //	服务人数
-        serviceStatus: "completed", //	服务状态。in_service服务中；completed:已完成
-        satisfaction: "", //满意度。不满意:bad、基本满意:good、非常满意:perfect
-        longitude: "", //	经度
-        latitude: "", //	维度
-        address: "",
-        fileList: [], //	附件列表
-      };
-    },
-    // 开启加载动画
-    startLoading() {
-      loading = Loading.service({
-        lock: true, // 是否锁定
-        text: "正在加载……", // 加载中需要显示的文字
-        background: "rgba(0,0,0,.7)", // 背景颜色
-      });
-    },
-    // 结束加载动画
-    endLoading() {
-      // clearTimeout(timer);
-      if (loading) {
-        loading.close();
-      }
+        resetData() {
+            this.formData = {
+                categoryCode: [],
+                parentCategoryCode: '',
+                gridIdList: [], //
+                principalName: "", //经办人(责任人)姓名
+                principalContact: "", //经办人联系方式
+                serviceTimeStart: "", //服务起始时间yyyy-MM-dd
+                serviceTimeEnd: "", //服务截止时间yyyy-MM-dd
+                remark: "", //
+            };
+            this.feedbackFormData = {
+                serviceGoal: "", //	服务目标
+                serviceEffect: "", //	服务效果
+                servicePeopleNumber: null, //	服务人数
+                serviceStatus: "completed", //	服务状态。in_service服务中；completed:已完成
+                satisfaction: "", //满意度。不满意:bad、基本满意:good、非常满意:perfect
+                longitude: "", //	经度
+                latitude: "", //	维度
+                address: "",
+                fileList: [], //	附件列表
+            };
+        },
+        // 开启加载动画
+        startLoading() {
+            loading = Loading.service({
+                lock: true, // 是否锁定
+                text: "正在加载……", // 加载中需要显示的文字
+                background: "rgba(0,0,0,.7)", // 背景颜色
+            });
+        },
+        // 结束加载动画
+        endLoading() {
+            // clearTimeout(timer);
+            if (loading) {
+                loading.close();
+            }
+        },
     },
-  },
 };
 </script>
   
-    <style lang="scss" scoped>
+<style lang="scss" scoped>
 @import "@/assets/scss/modules/management/form-main.scss";
 @import "@/assets/scss/modules/visual/a_customize.scss";
 
 .form-item::v-deep .el-form-item__label {
-  color: #fff;
+    color: #fff;
 }
+
 .form-item {
-  .el-radio {
-    color: #fff;
-  }
+    .el-radio {
+        color: #fff;
+    }
 
-  .el-checkbox {
-    color: #fff;
-  }
+    .el-checkbox {
+        color: #fff;
+    }
 }
 </style>
   
diff --git a/src/views/modules/communityService/gangweizhaoren/editForm.vue b/src/views/modules/communityService/gangweizhaoren/editForm.vue
index 81940c1c4..264e05433 100644
--- a/src/views/modules/communityService/gangweizhaoren/editForm.vue
+++ b/src/views/modules/communityService/gangweizhaoren/editForm.vue
@@ -14,7 +14,7 @@
                         style="display: block">
             <span>{{formData.serviceName}}</span>
             <!-- <el-select class="item_width_1"
-                       v-model="formData.serviceProjectId"
+                       v-model.trim="formData.serviceProjectId"
                        placeholder="请选择"
                        filterable
                        clearable>
@@ -33,7 +33,7 @@
                         style="display: block">
             <span>{{serviceOrgName}}</span>
             <!-- <el-select class="item_width_1"
-                       v-model="formData.serviceOrgId"
+                       v-model.trim="formData.serviceOrgId"
                        placeholder="请选择"
                        filterable
                        clearable>
@@ -56,7 +56,7 @@
             </div>
             <!-- <el-cascader class="item_width_1"
                          ref="myCascader"
-                         v-model="scopeIdArray"
+                         v-model.trim="scopeIdArray"
                          :key="iscascaderShow"
                          :options="casOptions"
                          :props="optionProps"
@@ -69,7 +69,7 @@
                         label-width="150px"
                         style="display: block">
             <el-select :disabled="formType==='detail'"
-                       v-model="formData.policyId"
+                       v-model.trim="formData.policyId"
                        class="input-width-small"
                        placeholder="请选择"
                        clearable>
@@ -93,7 +93,7 @@
             <el-input :disabled="formType==='detail'"
                       class="item_width_1"
                       placeholder="请输入经办人姓名"
-                      v-model="formData.principalName">
+                      v-model.trim="formData.principalName">
             </el-input>
           </el-form-item>
           <el-form-item label="联系方式"
@@ -103,11 +103,11 @@
             <el-input :disabled="formType==='detail'"
                       class="item_width_1"
                       placeholder="请输入联系方式"
-                      v-model="formData.principalContact">
+                      v-model.trim="formData.principalContact">
             </el-input>
           </el-form-item>
           <el-form-item label="指派服务" label-width="150px">
-             <el-switch v-model="assignSwitch"> </el-switch>
+             <el-switch v-model.trim="assignSwitch"> </el-switch>
            </el-form-item>
 
             <el-form-item
@@ -117,7 +117,7 @@
             style="display: block"
             v-show="this.assignSwitch"
              >
-             <input type="text" v-model="formData.resiSearchTagId" v-show="false">
+             <input type="text" v-model.trim="formData.resiSearchTagId" v-show="false">
               <template  v-if="this.resiSearchTagName">
                 <el-tag   @close="handleCloseTag"  closable style="margin-right:10px;">
                 {{this.resiSearchTagName }}
@@ -133,7 +133,7 @@
                         prop="serviceTimeStart"
                         style="display: block">
             <el-date-picker :disabled="formType==='detail'"
-                            v-model="formData.serviceTimeStart"
+                            v-model.trim="formData.serviceTimeStart"
                             :picker-options="startPickerOptions"
                             class="item_width_2"
                             type="date"
@@ -143,7 +143,7 @@
             </el-date-picker>
             <span class="u-data-tag">至</span>
             <el-date-picker :disabled="formType==='detail'"
-                            v-model="formData.serviceTimeEnd"
+                            v-model.trim="formData.serviceTimeEnd"
                             :picker-options="endPickerOptions"
                             class="item_width_2 u-data-tag"
                             type="date"
@@ -164,7 +164,7 @@
                       show-word-limit
                       :rows="3"
                       placeholder="请输入备注，不超过500字"
-                      v-model="formData.remark"></el-input>
+                      v-model.trim="formData.remark"></el-input>
           </el-form-item>
 
         </el-form>
@@ -188,7 +188,7 @@
                         show-word-limit
                         :rows="3"
                         placeholder="请输入服务目标，不超过1000字"
-                        v-model="feedbackFormData.serviceGoal"></el-input>
+                        v-model.trim="feedbackFormData.serviceGoal"></el-input>
             </el-form-item>
 
             <el-form-item label="服务效果"
@@ -201,7 +201,7 @@
                         show-word-limit
                         :rows="3"
                         placeholder="请输入服务效果，不超过1000字"
-                        v-model="feedbackFormData.serviceEffect"></el-input>
+                        v-model.trim="feedbackFormData.serviceEffect"></el-input>
             </el-form-item>
 
             <el-form-item label="服务人数"
@@ -209,7 +209,7 @@
                           prop="servicePeopleNumber"
                           label-width="150px">
               <el-input-number class="item_width_2"
-                               v-model="feedbackFormData.servicePeopleNumber"
+                               v-model.trim="feedbackFormData.servicePeopleNumber"
                                :min="0"
                                :max="9999"
                                label="服务人数"></el-input-number>
@@ -221,7 +221,7 @@
                           prop="serviceStatus">
               <span>已完成</span>
               <!-- <el-select class="item_width_1"
-                         v-model="feedbackFormData.serviceStatus"
+                         v-model.trim="feedbackFormData.serviceStatus"
                          placeholder="全部"
                          clearable>
                 <el-option v-for="item in statusArray"
@@ -237,7 +237,7 @@
                           label-width="150px"
                           prop="satisfaction">
               <el-select class="item_width_2"
-                         v-model="feedbackFormData.satisfaction"
+                         v-model.trim="feedbackFormData.satisfaction"
                          placeholder="全部"
                          clearable>
                 <el-option v-for="item in satisfyArray"
@@ -253,7 +253,7 @@
                           label-width="150px"
                           style="display: block">
               <el-input class="item_width_1"
-                        v-model="feedbackFormData.address"></el-input>
+                        v-model.trim="feedbackFormData.address"></el-input>
             </el-form-item>
             <!-- <el-form-item label="地图位置"
                           label-width="150px"
@@ -268,7 +268,7 @@
                     <el-input maxlength="50"
                               size="mini"
                               placeholder="请输入关键字"
-                              v-model="keyWords">
+                              v-model.trim="keyWords">
                     </el-input>
                     <el-button style="margin-left: 10px"
                                type="primary"
diff --git a/src/views/modules/communityService/gangweizhaoren/index.vue b/src/views/modules/communityService/gangweizhaoren/index.vue
index 556abdc43..0294fc099 100644
--- a/src/views/modules/communityService/gangweizhaoren/index.vue
+++ b/src/views/modules/communityService/gangweizhaoren/index.vue
@@ -8,7 +8,7 @@
                  :label-width="'100px'">
                  <el-form-item label="服务类别" prop="categoryCode">
                     <el-cascader
-                      v-model="formData.categoryCode"
+                      v-model.trim="formData.categoryCode"
                       class="u-item-width-daterange2"
                       size="small"
                       :options="searchdemandOptions"
@@ -20,7 +20,7 @@
 
             <el-form-item label="服务时间"
                           prop="serviceTimeStart">
-              <el-date-picker v-model="formData.serviceTimeStart"
+              <el-date-picker v-model.trim="formData.serviceTimeStart"
                               :picker-options="startPickerOptions"
                               class="u-item-width-daterange"
                               size="small"
@@ -30,7 +30,7 @@
                               placeholder="开始时间">
               </el-date-picker>
               <span class="u-data-tag">至</span>
-              <el-date-picker v-model="formData.serviceTimeEnd"
+              <el-date-picker v-model.trim="formData.serviceTimeEnd"
                               :picker-options="endPickerOptions"
                               class="u-item-width-daterange u-data-tag"
                               size="small"
@@ -44,7 +44,7 @@
 
             <el-form-item label="服务事项"
                           prop="serviceName">
-              <el-input v-model="formData.serviceName"
+              <el-input v-model.trim="formData.serviceName"
                         class="u-item-width-normal"
                         size="small"
                         clearable
@@ -54,7 +54,7 @@
 
             <el-form-item label="服务组织"
                           prop="serviceOrgType">
-              <el-select v-model="formData.serviceOrgType"
+              <el-select v-model.trim="formData.serviceOrgType"
                          class="u-item-width-daterange"
                          placeholder="请选择"
                          size="small"
@@ -66,7 +66,7 @@
                            :value="item.value">
                 </el-option>
               </el-select>
-              <el-select v-model="formData.serviceOrgId"
+              <el-select v-model.trim="formData.serviceOrgId"
                          class="u-item-width-daterange u-data-tag"
                          filterable
                          placeholder="请选择"
@@ -85,7 +85,7 @@
             <el-form-item label="服务状态"
                           prop="serviceStatus">
               <el-select class="u-item-width-normal"
-                         v-model="formData.serviceStatus"
+                         v-model.trim="formData.serviceStatus"
                          placeholder="全部"
                          size="small"
                          clearable>
@@ -100,7 +100,7 @@
             <el-form-item label="满意度"
                           prop="satisfaction">
               <el-select class="u-item-width-normal"
-                         v-model="formData.satisfaction"
+                         v-model.trim="formData.satisfaction"
                          placeholder="全部"
                          size="small"
                          clearable>
diff --git a/src/views/modules/communityService/gangweizhaoren/personList.vue b/src/views/modules/communityService/gangweizhaoren/personList.vue
index 8db053502..74f4e7567 100644
--- a/src/views/modules/communityService/gangweizhaoren/personList.vue
+++ b/src/views/modules/communityService/gangweizhaoren/personList.vue
@@ -17,7 +17,7 @@
         </el-form-item>
         <el-form-item label="人员姓名" prop="title">
           <el-input
-              v-model="searchFormData.name"
+              v-model.trim="searchFormData.name"
               class="u-item-width-normal"
               size="small"
               clearable
@@ -27,7 +27,7 @@
 
         <el-form-item label="手机号" prop="title">
           <el-input
-              v-model="searchFormData.mobile"
+              v-model.trim="searchFormData.mobile"
               class="u-item-width-normal"
               size="small"
               clearable
@@ -37,7 +37,7 @@
 
         <el-form-item label="身份证号" prop="title">
           <el-input
-              v-model="searchFormData.idCard"
+              v-model.trim="searchFormData.idCard"
               class="u-item-width-normal"
               size="small"
               clearable
@@ -47,7 +47,7 @@
 
         <el-form-item label="享受服务次数" prop="title">
           <el-input
-              v-model="searchFormData.serveTimes"
+              v-model.trim="searchFormData.serveTimes"
               class="u-item-width-normal"
               size="small"
               clearable
@@ -56,7 +56,7 @@
         </el-form-item>
 
         <el-form-item label="家庭住址" prop="title">
-          <el-select v-model="searchFormData.villageId" placeholder="请选择小区"
+          <el-select v-model.trim="searchFormData.villageId" placeholder="请选择小区"
                      @change="handleQuarterSelectorsChange" clearable>
             <el-option
                 v-for="item in quartersSelectItems"
@@ -65,7 +65,7 @@
                 :value="item.value">
             </el-option>
           </el-select>
-          <el-select v-model="searchFormData.buildId" placeholder="请选择楼栋"
+          <el-select v-model.trim="searchFormData.buildId" placeholder="请选择楼栋"
                      @change="handleBuildSelectorsChange" clearable>
             <el-option
                 v-for="item in buildingSelectItems"
@@ -74,7 +74,7 @@
                 :value="item.value">
             </el-option>
           </el-select>
-          <el-select v-model="searchFormData.unitId" placeholder="请选择单元"
+          <el-select v-model.trim="searchFormData.unitId" placeholder="请选择单元"
                      @change="handleUnitSelectorsChange" clearable>
             <el-option
                 v-for="item in unitSelectItems"
@@ -83,7 +83,7 @@
                 :value="item.value">
             </el-option>
           </el-select>
-          <el-select v-model="searchFormData.homeId" placeholder="请选择房屋"
+          <el-select v-model.trim="searchFormData.homeId" placeholder="请选择房屋"
                      @change="handleUnitSelectorsChange" clearable>
             <el-option
                 v-for="item in homeSelectItems"
diff --git a/src/views/modules/communityService/gxxq/addForm.vue b/src/views/modules/communityService/gxxq/addForm.vue
index ff3c49165..31ead9c47 100644
--- a/src/views/modules/communityService/gxxq/addForm.vue
+++ b/src/views/modules/communityService/gxxq/addForm.vue
@@ -14,7 +14,7 @@
         <!-- 需求类别 -->
         <el-form-item label="需求类型" prop="categoryCode" label-width="150px">
           <el-cascader
-            v-model="formData.categoryCode"
+            v-model.trim="formData.categoryCode"
             :options="demandOptions"
             :props="{label: 'categoryName',value: 'categoryCode',children: 'childCateList'}"
             clearable
@@ -34,7 +34,7 @@
           <el-input
             class="item_width_1"
             placeholder="请输入需求标题"
-            v-model="formData.title"
+            v-model.trim="formData.title"
           >
           </el-input>
         </el-form-item>
@@ -53,7 +53,7 @@
             show-word-limit
             :rows="3"
             placeholder="请输入备注，不超过1000字"
-            v-model="formData.content"
+            v-model.trim="formData.content"
           ></el-input>
         </el-form-item>
 
@@ -75,7 +75,7 @@
         </el-form-item>
         <el-form-item label="指派服务" label-width="150px">
           <el-switch
-            v-model="formData.assignFlag"
+            v-model.trim="formData.assignFlag"
             :active-value="1"
             :inactive-value="0"
           >
@@ -92,7 +92,7 @@
           prop="serverOrgId"
         >
           <el-select
-            v-model="newFormData.serverOrgType"
+            v-model.trim="newFormData.serverOrgType"
             class="input-width-small"
             placeholder="请选择"
             clearable
@@ -108,7 +108,7 @@
           </el-select>
           -
           <el-select
-            v-model="newFormData.serverOrgId"
+            v-model.trim="newFormData.serverOrgId"
             class="input-width-middle"
             filterable
             placeholder="请选择"
@@ -130,7 +130,7 @@
           label-width="150px"
           style="display: block"
         >
-          <el-checkbox-group v-model="newFormData.noticeApproches">
+          <el-checkbox-group v-model.trim="newFormData.noticeApproches">
             <el-checkbox label="1" value="1">短信通知</el-checkbox>
             <el-checkbox label="2" value="2">微信公众号消息通知</el-checkbox>
           </el-checkbox-group>
@@ -146,7 +146,7 @@
           <el-cascader
             class="item_width_1"
             ref="myCascader"
-            v-model="newFormData.serviceScopeList"
+            v-model.trim="newFormData.serviceScopeList"
             :key="iscascaderShow"
             :options="casOptions"
             :props="optionProps"
@@ -164,7 +164,7 @@
             
         <!-- :picker-options="startPickerOptions" -->
           <el-date-picker
-            v-model="newFormData.serviceTimeStart"
+            v-model.trim="newFormData.serviceTimeStart"
             class="item_width_2"
             style="width: 220px"
             type="datetime"
@@ -176,7 +176,7 @@
           <span class="u-data-tag">至</span>
           <!--  :picker-options="endPickerOptions"-->
           <el-date-picker
-            v-model="newFormData.serviceTimeEnd"
+            v-model.trim="newFormData.serviceTimeEnd"
             class="item_width_2 u-data-tag"
             style="width: 220px"
             type="datetime"
diff --git a/src/views/modules/communityService/gxxq/index.vue b/src/views/modules/communityService/gxxq/index.vue
index df28e6cae..69b3f7c5c 100644
--- a/src/views/modules/communityService/gxxq/index.vue
+++ b/src/views/modules/communityService/gxxq/index.vue
@@ -9,7 +9,7 @@
       >
       <el-form-item label="需求分类" prop="categoryCode">
           <el-cascader
-            v-model="formData.categoryCode"
+            v-model.trim="formData.categoryCode"
             class="u-item-width-daterange2"
             size="small"
             :options="searchdemandOptions"
@@ -21,7 +21,7 @@
 
         <el-form-item label="需求标题" prop="title">
           <el-input
-            v-model="formData.title"
+            v-model.trim="formData.title"
             class="u-item-width-normal"
             size="small"
             clearable
@@ -33,7 +33,7 @@
         <el-form-item label="需求状态" prop="assignFlag">
           <el-select
             class="u-item-width-normal"
-            v-model="formData.assignFlag"
+            v-model.trim="formData.assignFlag"
             placeholder="全部"
             size="small"
             clearable
@@ -49,7 +49,7 @@
         </el-form-item>
         <el-form-item label="发布时间" prop="timeStart">
           <el-date-picker
-            v-model="formData.timeStart"
+            v-model.trim="formData.timeStart"
             class="u-item-width-daterange"
             size="small"
             type="date"
@@ -61,7 +61,7 @@
           </el-date-picker>
           <span class="u-data-tag">至</span>
           <el-date-picker
-            v-model="formData.timeEnd"
+            v-model.trim="formData.timeEnd"
             class="u-item-width-daterange u-data-tag"
             size="small"
             type="date"
diff --git a/src/views/modules/communityService/jinengzhaoren/addForm.vue b/src/views/modules/communityService/jinengzhaoren/addForm.vue
index aadb0af5e..1ef962eb5 100644
--- a/src/views/modules/communityService/jinengzhaoren/addForm.vue
+++ b/src/views/modules/communityService/jinengzhaoren/addForm.vue
@@ -1,33 +1,19 @@
 <template>
-  <div>
-    <div
-      class="dialog-h-content scroll-h"
-      :class="{ 'visiual-form': source === 'visiual' }"
-    >
-      <el-form
-        v-if="formType === 'add' || formType === 'edit'"
-        ref="ref_form"
-        :inline="true"
-        :model="formData"
-        :rules="dataRule"
-        class="div_form"
-      >
-      <el-form-item label="需求类型" prop="categoryCode" label-width="150px">
-          <el-cascader
-            v-model="formData.categoryCode"
-            :options="demandOptions"
-            :props="{label: 'categoryName',value: 'categoryCode',children: 'childCateList'}"
-            clearable
-            size="small"
-            class="u-item-width-normal"
-          ></el-cascader>
-        </el-form-item>
-        <!-- <el-form-item label="政策依据"
+    <div>
+        <div class="dialog-h-content scroll-h" :class="{ 'visiual-form': source === 'visiual' }">
+            <el-form v-if="formType === 'add' || formType === 'edit'" ref="ref_form" :inline="true" :model="formData"
+                :rules="dataRule" class="div_form">
+                <el-form-item label="需求类型" prop="categoryCode" label-width="150px">
+                    <el-cascader v-model.trim="formData.categoryCode" :options="demandOptions"
+                        :props="{ label: 'categoryName', value: 'categoryCode', children: 'childCateList' }" clearable
+                        size="small" class="u-item-width-normal"></el-cascader>
+                </el-form-item>
+                <!-- <el-form-item label="政策依据"
                         prop="policyId"
                         label-width="150px"
                         style="display: block">
             <el-select :disabled="formType==='detail'"
-                       v-model="formData.policyId"
+                       v-model.trim="formData.policyId"
                        class="input-width-small"
                        placeholder="请选择"
                        clearable>
@@ -38,202 +24,92 @@
               </el-option>
             </el-select>
           </el-form-item> -->
-        <el-form-item
-          label="服务事项"
-          prop="serviceName"
-          label-width="150px"
-          :class="{ 'form-item': source === 'visiual' }"
-          style="display: block"
-        >
-          <el-input
-            class="item_width_1"
-            placeholder="请输入服务事项"
-            v-model="formData.serviceName"
-          >
-          </el-input>
-        </el-form-item>
-
-        <el-form-item
-          label="服务内容"
-          prop="remark"
-          label-width="150px"
-          :class="{ 'form-item': source === 'visiual' }"
-          style="display: block"
-        >
-          <el-input
-            class="item_width_1"
-            type="textarea"
-            maxlength="1000"
-            show-word-limit
-            :rows="3"
-            placeholder="请输入备注，不超过1000字"
-            v-model="formData.remark"
-          ></el-input>
-        </el-form-item>
-        <el-form-item
-          label="查找享受服务人员"
-          prop="resiSearchTagId"
-          :class="{ 'form-item': source === 'visiual' }"
-          label-width="150px"
-          style="display: block"
-        >
-          <input
-            type="text"
-            v-model="formData.resiSearchTagId"
-            v-show="false"
-          />
-          <template
-            style="margin-right: 10px"
-            v-if="formData.resiSearchTagName"
-          >
-            <el-tag @close="handleCloseTag" closable style="margin-right: 10px">
-              {{ formData.resiSearchTagName }}
-            </el-tag>
-          </template>
-
-          <el-button type="primary" @click="handleClickLabel" size="mini">
-            <span> <i class="el-icon-plus"></i> 按标签查找 </span>
-          </el-button>
-        </el-form-item>
-        <el-form-item
-          label="服务组织"
-          prop="serviceOrgId"
-          label-width="150px"
-          :class="{ 'form-item': source === 'visiual' }"
-          style="display: block"
-        >
-          <el-select
-            v-model="formData.serviceOrgType"
-            class="input-width-small"
-            placeholder="请选择"
-            clearable
-            @change="handleServiceChange('add', $event)"
-          >
-            <el-option
-              v-for="item in serviceOptions"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"
-            >
-            </el-option>
-          </el-select>
-          -
-          <el-select
-            v-model="formData.serviceOrgId"
-            class="input-width-middle"
-            filterable
-            placeholder="请选择"
-            clearable
-          >
-            <el-option
-              v-for="item in serviceOptiondList"
-              :key="item.id"
-              :label="item.label"
-              :value="item.id"
-            >
-            </el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item
-          prop="noticeApproches"
-          label="自动通知服务组织"
-          label-width="150px"
-          style="display: block"
-        >
-          <el-checkbox-group v-model="formData.noticeApproches">
-            <el-checkbox label="sms" value="sms">短信通知</el-checkbox>
-            <el-checkbox label="wx_official_account" value="wx_official_account">微信公众号消息通知</el-checkbox>
-          </el-checkbox-group>
-        </el-form-item>
-        <el-form-item
-          label="服务范围"
-          prop="gridIdList"
-          label-width="150px"
-          :class="{ 'form-item': source === 'visiual' }"
-          style="display: block"
-        >
-          <el-cascader
-            class="item_width_1"
-            ref="myCascader"
-            v-model="scopeIdArray"
-            :key="iscascaderShow"
-            :options="casOptions"
-            :props="optionProps"
-            :show-all-levels="false"
-            collapse-tags
-            @change="handleChangeScope"
-          ></el-cascader>
-        </el-form-item>
-
-        <el-form-item
-          label="服务时间"
-          label-width="150px"
-          :class="{ 'form-item': source === 'visiual' }"
-          prop="serviceTimeStart"
-        >
-          <el-date-picker
-            v-model="formData.serviceTimeStart"
-            :picker-options="startPickerOptions"
-            class="item_width_2"
-            style="width: 220px"
-            type="date"
-            value-format="yyyy-MM-dd HH:mm:ss"
-            value="yyyy-MM-dd"
-            placeholder="开始时间"
-          >
-          </el-date-picker>
-          <span class="u-data-tag">至</span>
-          <el-date-picker
-            v-model="formData.serviceTimeEnd"
-            :picker-options="endPickerOptions"
-            class="item_width_2 u-data-tag"
-            style="width: 220px"
-            type="date"
-            value-format="yyyy-MM-dd HH:mm:ss"
-            value="yyyy-MM-dd"
-            placeholder="结束时间"
-          >
-          </el-date-picker>
-        </el-form-item>
-
-        <el-form-item
-          label="经办人"
-          prop="principalName"
-          :class="{ 'form-item': source === 'visiual' }"
-          label-width="150px"
-          style="display: block"
-        >
-          <el-input
-            class="item_width_1"
-            placeholder="请输入联系人姓名"
-            v-model="formData.principalName"
-          >
-          </el-input>
-        </el-form-item>
-        <el-form-item
-          label="联系方式"
-          prop="principalContact"
-          :class="{ 'form-item': source === 'visiual' }"
-          label-width="150px"
-          style="display: block"
-        >
-          <el-input
-            class="item_width_1"
-            placeholder="请输入联系人电话"
-            v-model="formData.principalContact"
-          >
-          </el-input>
-        </el-form-item>
-        <el-form-item
-            label="上传图片"
-            label-width="150px"
-            style="display: block"
-            prop="attachments"
-            v-if="formType === 'edit'"
-        >
-          <UploadImages :fileList="formData.attachments" @change="(val) => formData.attachments = val"/>
-        </el-form-item>
-        <!-- <el-form-item
+                <el-form-item label="服务事项" prop="serviceName" label-width="150px"
+                    :class="{ 'form-item': source === 'visiual' }" style="display: block">
+                    <el-input class="item_width_1" placeholder="请输入服务事项" v-model.trim="formData.serviceName">
+                    </el-input>
+                </el-form-item>
+
+                <el-form-item label="服务内容" prop="remark" label-width="150px" :class="{ 'form-item': source === 'visiual' }"
+                    style="display: block">
+                    <el-input class="item_width_1" type="textarea" maxlength="1000" show-word-limit :rows="3"
+                        placeholder="请输入备注，不超过1000字" v-model.trim="formData.remark"></el-input>
+                </el-form-item>
+                <el-form-item label="查找享受服务人员" prop="resiSearchTagId" :class="{ 'form-item': source === 'visiual' }"
+                    label-width="150px" style="display: block">
+                    <input type="text" v-model.trim="formData.resiSearchTagId" v-show="false" />
+                    <template style="margin-right: 10px" v-if="formData.resiSearchTagName">
+                        <el-tag @close="handleCloseTag" closable style="margin-right: 10px">
+                            {{ formData.resiSearchTagName }}
+                        </el-tag>
+                    </template>
+
+                    <el-button type="primary" @click="handleClickLabel" size="mini">
+                        <span> <i class="el-icon-plus"></i> 按标签查找 </span>
+                    </el-button>
+                </el-form-item>
+                <el-form-item label="服务组织" prop="serviceOrgId" label-width="150px"
+                    :class="{ 'form-item': source === 'visiual' }" style="display: block">
+                    <el-select v-model.trim="formData.serviceOrgType" class="input-width-small" placeholder="请选择" clearable
+                        @change="handleServiceChange('add', $event)">
+                        <el-option v-for="item in serviceOptions" :key="item.value" :label="item.label" :value="item.value">
+                        </el-option>
+                    </el-select>
+                    -
+                    <el-select v-model.trim="formData.serviceOrgId" class="input-width-middle" filterable placeholder="请选择"
+                        clearable>
+                        <el-option v-for="item in serviceOptiondList" :key="item.id" :label="item.label" :value="item.id">
+                        </el-option>
+                    </el-select>
+                </el-form-item>
+                <el-form-item prop="noticeApproches" label="自动通知服务组织" label-width="150px" style="display: block">
+                    <el-checkbox-group v-model.trim="formData.noticeApproches">
+                        <el-checkbox label="sms" value="sms">短信通知</el-checkbox>
+                        <el-checkbox label="wx_official_account" value="wx_official_account">微信公众号消息通知</el-checkbox>
+                    </el-checkbox-group>
+                </el-form-item>
+                <el-form-item label="服务范围" prop="gridIdList" label-width="150px"
+                    :class="{ 'form-item': source === 'visiual' }" style="display: block">
+                    <el-cascader class="item_width_1" ref="myCascader" v-model.trim="scopeIdArray" :key="iscascaderShow"
+                        :options="casOptions" :props="optionProps" :show-all-levels="false" collapse-tags
+                        @change="handleChangeScope"></el-cascader>
+                </el-form-item>
+
+                <el-form-item label="服务时间" label-width="150px" :class="{ 'form-item': source === 'visiual' }"
+                    prop="serviceTimeStart">
+                    <el-date-picker v-model.trim="formData.serviceTimeStart" :picker-options="startPickerOptions"
+                        class="item_width_2" style="width: 220px" type="date" value-format="yyyy-MM-dd HH:mm:ss"
+                        value="yyyy-MM-dd" placeholder="开始时间">
+                    </el-date-picker>
+                    <span class="u-data-tag">至</span>
+                    <el-date-picker v-model.trim="formData.serviceTimeEnd" :picker-options="endPickerOptions"
+                        class="item_width_2 u-data-tag" style="width: 220px" type="date" value-format="yyyy-MM-dd HH:mm:ss"
+                        value="yyyy-MM-dd" placeholder="结束时间">
+                    </el-date-picker>
+                </el-form-item>
+
+                <el-form-item label="经办人" prop="principalName" :class="{ 'form-item': source === 'visiual' }"
+                    label-width="150px" style="display: block">
+                    <el-input class="item_width_1" placeholder="请输入联系人姓名" v-model.trim="formData.principalName">
+                    </el-input>
+                </el-form-item>
+                <el-form-item label="联系方式" prop="principalContact" :class="{ 'form-item': source === 'visiual' }"
+                    label-width="150px" style="display: block">
+                    <el-input class="item_width_1" placeholder="请输入联系人电话" v-model.trim="formData.principalContact">
+                    </el-input>
+                </el-form-item>
+                <el-form-item label="服务状态" prop="serviceStatus" :class="{ 'form-item': source === 'visiual' }"
+                    label-width="150px" style="display: block">
+                    <el-select v-model.trim="formData.serviceStatus" placeholder="请选择">
+                        <el-option v-for="e in serviceStatusOptions" :key="e.value" :value="e.value"
+                            :label="e.label"></el-option>
+                    </el-select>
+                </el-form-item>
+                <el-form-item label="上传图片" label-width="150px" style="display: block" prop="attachments"
+                    v-if="formType === 'edit'">
+                    <UploadImages :fileList="formData.attachments" @change="(val) => formData.attachments = val" />
+                </el-form-item>
+                <!-- <el-form-item
           label="直接反馈"
           prop="remark"
           label-width="150px"
@@ -242,100 +118,50 @@
         >
           <el-checkbox
             :label="'是'"
-            v-model="showFeedback"
+            v-model.trim="showFeedback"
             @change="handleChangeFeedback"
           ></el-checkbox>
         </el-form-item> -->
-      </el-form>
-      <div v-show="formType === 'feedback' || showFeedback">
-        <!-- <h3 class="d-h3">反馈内容</h3> -->
-
-        <el-form
-          ref="ref_form_feedback"
-          :inline="true"
-          :model="feedbackFormData"
-          :rules="feedbackDataRule"
-          class="div_form"
-        >
-          <el-form-item
-            label="满意度"
-            style="display: block"
-            label-width="150px"
-            :class="{ 'form-item': source === 'visiual' }"
-            prop="satisfaction"
-          >
-            <el-select
-              class="item_width_2"
-              v-model="feedbackFormData.satisfaction"
-              placeholder="全部"
-              clearable
-            >
-              <el-option
-                v-for="item in satisfyArray"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-              >
-              </el-option>
-            </el-select>
-          </el-form-item>
-          <el-form-item
-            label="备注"
-            prop="serviceGoal"
-            :class="{ 'form-item': source === 'visiual' }"
-            label-width="150px"
-            style="display: block"
-          >
-            <el-input
-              class="item_width_1"
-              type="textarea"
-              maxlength="1000"
-              show-word-limit
-              :rows="3"
-              v-model="feedbackFormData.serviceGoal"
-            ></el-input>
-          </el-form-item>
-        </el-form>
-      </div>
-    </div>
-
-    <div class="div_btn">
-      <el-button size="small" @click="handleCancle">取 消</el-button>
-      <el-button
-        size="small"
-        type="primary"
-        :disabled="btnDisable"
-        @click="handleComfirm"
-        >确 定</el-button
-      >
-    </div>
-
-    <el-dialog
-      v-if="showLabelForm"
-      :visible.sync="showLabelForm"
-      :append-to-body="true"
-      :close-on-click-modal="false"
-      :close-on-press-escape="false"
-      :title="'标签配置'"
-      width="954px"
-      top="5vh"
-      class="dialog-h"
-      @closed="showLabelForm = false"
-    >
-      <label-form
-        ref="ref_label_form"
-        :ruleList="ruleList"
-        @dialogCancle="addFormCancle"
-        @dialogOk="addFormOk"
-      >
-        <!--    @handleOk="handleOk"
+            </el-form>
+            <div v-show="formType === 'feedback' || showFeedback">
+                <!-- <h3 class="d-h3">反馈内容</h3> -->
+
+                <el-form ref="ref_form_feedback" :inline="true" :model="feedbackFormData" :rules="feedbackDataRule"
+                    class="div_form">
+                    <el-form-item label="满意度" style="display: block" label-width="150px"
+                        :class="{ 'form-item': source === 'visiual' }" prop="satisfaction">
+                        <el-select class="item_width_2" v-model.trim="feedbackFormData.satisfaction" placeholder="全部" clearable>
+                            <el-option v-for="item in satisfyArray" :key="item.value" :label="item.label"
+                                :value="item.value">
+                            </el-option>
+                        </el-select>
+                    </el-form-item>
+                    <el-form-item label="备注" prop="serviceGoal" :class="{ 'form-item': source === 'visiual' }"
+                        label-width="150px" style="display: block">
+                        <el-input class="item_width_1" type="textarea" maxlength="1000" show-word-limit :rows="3"
+                            v-model.trim="feedbackFormData.serviceGoal"></el-input>
+                    </el-form-item>
+                </el-form>
+            </div>
+        </div>
+
+        <div class="div_btn">
+            <el-button size="small" @click="handleCancle">取 消</el-button>
+            <el-button size="small" type="primary" :disabled="btnDisable" @click="handleComfirm">确 定</el-button>
+        </div>
+
+        <el-dialog v-if="showLabelForm" :visible.sync="showLabelForm" :append-to-body="true" :close-on-click-modal="false"
+            :close-on-press-escape="false" :title="'标签配置'" width="954px" top="5vh" class="dialog-h"
+            @closed="showLabelForm = false">
+            <label-form ref="ref_label_form" :ruleList="ruleList" @dialogCancle="addFormCancle" @dialogOk="addFormOk">
+                <!--    @handleOk="handleOk"
           @handleClose="handleClose" -->
-      </label-form>
-    </el-dialog>
-  </div>
+            </label-form>
+        </el-dialog>
+    </div>
 </template>
   
-    <script>
+<script>
 import { mapGetters } from "vuex";
 import { Loading } from "element-ui"; // 引入Loading服务
 import { requestPost, requestGet } from "@/js/dai/request";
@@ -349,716 +175,719 @@ let loading; // 加载动画
 let map;
 
 export default {
-  props: {
-    defaultData: {
-      type: Object,
-      default: null,
-    },
-    serviceRecordId: {
-      type: String,
-      required: "",
-    },
-    serviceProjectName: {
-      //服务项目名称
-      type: String,
-      required: false,
-      default: "",
-    },
-    formType: {
-      //表单操作类型 add新增，edit编辑，detail详情,feedback反馈
-      type: String,
-      required: "",
-    },
-    categrayArray: {
-      type: Array,
-      default() {
-        return [];
-      },
-    },
-    source: {
-      //展示来源：manage  管理平台    visiual  可视化平台
-      type: String,
-      default: "manage",
-    },
-  },
-
-  data() {
-    let endDisabledDate = (time) => {
-      //这个关键属性我们一定要写在data的里面并且return的外面，这是动态改变区间的关键
-      let nowData = Date.now();
-      if (this.formData.serviceTimeStart) {
-        let serviceTimeStart = new Date(this.formData.serviceTimeStart);
-        return (
-          time.getTime() < serviceTimeStart- 24 * 60 * 60 * 1000 ||
-          time.getTime() === serviceTimeStart- 24 * 60 * 60 * 1000
-        );
-      } else {
-        return (time.getTime() > nowData || time.getTime() === nowData) ;
-      }
-    };
-    let startDisabledDate = (time) => {
-      //这个关键属性我们一定要写在data的里面并且return的外面，这是动态改变区间的关键
-      let nowData = Date.now() - 24 * 60 * 60 * 1000;
-      return time.getTime() < nowData;
-    };
-    return {
-      btnDisable: false,
-      casOptions: [],
-      scopeIdArray: [],
-      iscascaderShow: 0,
-
-      optionProps: {
-        multiple: true,
-        value: "objectId",
-        label: "objectName",
-        children: "children",
-        checkStrictly: true,
-        emitPath: false,
-      },
-
-      keyWords: "",
-      formData: {
-        categoryCode:[],
-        parentCategoryCode:'',
-        resiSearchTagId: "", //查找享受服务人员
-        resiSearchTagName: "", //享受服务人员名称
-        serviceName: "", //服务事项
-        noticeApproches: [], //通知服务组织
-        policyId: "", //政策依据
-        serviceOrgType: "", //服务组织类型 社区自组织：community_org， 志愿者：ic_user_volunteer， 联建单位：party_unit
-        serviceOrgId: "", //服务组织Id
-        gridIdList: [], //
-        principalName: "", //经办人(责任人)姓名
-        principalContact: "", //经办人联系方式
-        serviceTimeStart: "", //服务起始时间yyyy-MM-dd
-        serviceTimeEnd: "", //服务截止时间yyyy-MM-dd
-        dataCategoryCode:"skill",
-        remark: "", //
-        attachments: []
-      },
-      feedbackFormData: {
-        serviceGoal: "", //	服务目标
-        serviceEffect: "", //	服务效果
-        servicePeopleNumber: null, //	服务人数
-        serviceStatus: "completed", //	服务状态。in_service服务中；completed:已完成
-        satisfaction: "", //满意度。不满意:bad、基本满意:good、非常满意:perfect
-        longitude: "", //	经度
-        latitude: "", //	维度
-        address: "",
-        fileList: [], //	附件列表
-      },
-      sarr: [],
-      dataRule: {
-        categoryCode: [
-          { required: true, message: "服务类别不能为空", trigger: "change" },
-        ],
-        serviceName: [
-          { required: true, message: "服务事项不能为空", trigger: "change" },
-        ],
-        serviceOrgId: [
-          { required: true, message: "服务组织不能为空", trigger: "change" },
-        ],
-
-        serviceTimeStart: [
-          { required: true, message: "服务时间不能为空", trigger: "change" },
-        ],
-        gridIdList: [
-          { required: true, message: "服务范围不能为空", trigger: "change" },
-        ],
-        resiSearchTagId: [
-          { required: true, message: "享受服务人员不能为空", trigger: "blur" },
-        ],
-      },
-
-      endPickerOptions: {
-        disabledDate: endDisabledDate,
-      },
-      startPickerOptions: {
-        disabledDate: startDisabledDate,
-      },
-
-      serviceOptions: [],
-      serviceOptiondList: [],
-      policyList: [],
-
-      fileList: [],
-      uploadUlr: window.SITE_CONFIG["apiURL"] + "/oss/file/uploadvariedfile",
-
-      showPersonList: false,
-      ruleList: [],
-      firstInitMap: true,
-
-      categrayOptions: [],
-      statusArray: [
-        {
-          value: "in_service",
-          label: "进行中",
+    props: {
+        defaultData: {
+            type: Object,
+            default: null,
         },
-        {
-          value: "completed",
-          label: "已完成",
+        serviceRecordId: {
+            type: String,
+            required: "",
         },
-      ],
-      satisfyArray: [
-        {
-          value: "bad",
-          label: "不满意",
+        serviceProjectName: {
+            //服务项目名称
+            type: String,
+            required: false,
+            default: "",
         },
-        {
-          value: "good",
-          label: "基本满意",
+        formType: {
+            //表单操作类型 add新增，edit编辑，detail详情,feedback反馈
+            type: String,
+            required: "",
         },
-        {
-          value: "perfect",
-          label: "非常满意",
+        categrayArray: {
+            type: Array,
+            default() {
+                return [];
+            },
+        },
+        source: {
+            //展示来源：manage  管理平台    visiual  可视化平台
+            type: String,
+            default: "manage",
         },
-      ],
-      showLabelForm: false,
-      showFeedback: false,
-      demandOptions:[]
-    };
-  },
-
-  computed: {
-    feedbackDataRule() {
-      return {
-        // serviceGoal: [
-        //   { required: true, message: "服务目标不能为空", trigger: "blur" },
-        // ],
-
-        serviceEffect: [
-          { required: true, message: "服务效果不能为空", trigger: "blur" },
-        ],
-        servicePeopleNumber: [
-          { required: true, message: "服务人数不能为空", trigger: "blur" },
-        ],
-        serviceStatus: [
-          { required: true, message: "服务状态不能为空", trigger: "blur" },
-        ],
-        satisfaction: [
-          { required: true, message: "满意度不能为空", trigger: "blur" },
-        ],
-        address: [{ required: true, message: "地址不能为空", trigger: "blur" }],
-      };
-    },
-  },
-
-  watch: {
-    "formData.serviceTimeEnd": function (val) {
-      if (val && val != "") {
-        let arrayTemp = val.split(" ");
-        this.formData.serviceTimeEnd = arrayTemp[0] + " 23:59:59";
-      }
-    },
-  },
-
-  components: { labelForm, UploadImages },
-
-  async mounted() {
-    this.startLoading();
-    // 都已经重置了，还放在prop里干嘛，我不理解
-    this.categrayOptions = this.categrayArray;
-
-    // this.getCategrayList();
-    this.getDictOptions();
-    this.getPolicyList();
-    await this.loadScopeTree();
-    if (this.formType === "add") {
-      this.$refs.ref_form.resetFields();
-    } else if (this.formType == "edit") {
-      this.loadInfo();
-    }
-    await this.getDemandOptions()
-    await this.iniDefaultData();
-
-    this.endLoading();
-  },
-
-  methods: {
-    async getDemandOptions() {
-      this.$http
-        .post("/actual/base/serviceitem/listAllCategory")
-        .then(({ data: res }) => {
-          if (res.code !== 0) {
-            return this.$message.error(res.msg);
-          } else {
-            this.demandOptions = this.getFlagData(
-              this.getTreeData(res.data),
-              "usableFlag"
-            ).filter((item) => item.categoryCode == '1043');
-          }
-        })
-        .catch(() => {
-          return this.$message.error("网络错误");
-        });
-    },
-    getFlagData(data, flag) {
-      if (!Array.isArray(data)) return [];
-      let arr1 = data.filter((item) => item[flag]);
-      let arr2 = arr1.map((item) => {
-        if (item.childCateList)
-          return { ...item, childCateList: this.getFlagData(item.childCateList, flag) };
-        else return item;
-      });
-      // console.log('arrr-oppp', arr2)
-      return arr2;
-    },
-    getTreeData(data) {
-      if (!Array.isArray(data)) return [];
-      let arr = data.map((item) => {
-        let _item = {};
-        if (item.childCateList) {
-          if (item.childCateList.length === 0)
-            _item = { ...item, childCateList: undefined };
-          else _item = { ...item, childCateList: this.getTreeData(item.childCateList) };
-        } else {
-          _item = { ...item };
-        }
-        return _item;
-      });
-      return arr;
-    },
-    handelDisabledRules(v) {
-      if (!v) {
-        delete this.dataRule.resiSearchTagId;
-      } else {
-        var arr = [
-          {
-            required: true,
-            message: "享受服务人员不能为空",
-            trigger: "change",
-          },
-        ];
-        this.dataRule.resiSearchTagId = arr;
-      }
-      console.log(this.dataRule);
-    },
-    //获取服务详情数据
-    async loadInfo() {
-      const url = "/governance/icServiceSkillRecord/detail";
-      let params = {
-        serviceRecordId: this.serviceRecordId,
-      };
-
-      const { data, code, msg } = await requestPost(url, params);
-
-      if (code === 0) {
-        this.formData = { ...data };
-        if (data.categoryCode) {
-          this.formData.categoryCode = [data.parentCategoryCode, data.categoryCode];
-        } else {
-          this.formData.categoryCode = [data.parentCategoryCode];
-        }
-        if(!data.noticeApproches){
-          this.formData.noticeApproches = [];
-        }
-        this.scopeIdArray = data.gridIdList.map(i => i.objectId);
-        this.feedbackFormData = { ...data.feedback };
-        await this.getServiceuserList(data.serviceOrgType);
-        await this.getTagName();
-        // this.fileList = []
-        // if (data.feedback && data.feedback.fileList && data.feedback.fileList.length > 0) {
-        //   data.feedback.fileList.forEach(element => {
-        //     let obj = {
-        //       name: element.name,
-        //       format: element.format,
-        //       url: element.url,
-        //     }
-        //     this.fileList.push(obj)
-        //   });
-        // }
-      } else {
-        this.$message.error(msg);
-      }
-    },
-    async getTagName() {
-      const url = "/governance/resiSearchTag/listResiSearchTags";
-      let params = {
-        pageSize: 99,
-      };
-      let { data, msg, code } = await requestPost(url, params);
-      if (code == 0) {
-        let showAddProduct = data.list.filter((item) => {
-          return [this.formData.resiSearchTagId].includes(item.tagId);
-        });
-        this.formData.resiSearchTagName = showAddProduct[0].tagName;
-      } else {
-        this.$message.error(msg);
-      }
-    },
-    handleClickLabel() {
-      this.showLabelForm = true;
-      this.$nextTick(() => {
-        this.$refs["ref_label_form"].initForm("info");
-      });
-    },
-    addFormOk(val) {
-      this.showLabelForm = false;
-      this.formData.resiSearchTagId = val.tagId;
-      this.formData.resiSearchTagName = val.tagName;
-    },
-    addFormCancle() {
-      this.showLabelForm = false;
-    },
-    handleCloseTag() {
-      this.formData.resiSearchTagId = "";
-      this.formData.resiSearchTagName = "";
-    },
-    getLastItem(list, vals, key) {
-      let LIST = list || [];
-      for (let item of LIST) {
-        for (let i of vals) {
-          if (item[key] === i) {
-            this.sarr.push(item);
-          } else if (item["objectType"] == "district") {
-            this.getLastItem(item.children, vals, key);
-          } else {
-            this.getLastItem(item.children, vals, key);
-          }
-        }
-      }
-    },
-    async handleTreeList() {
-      const map = new Map();
-      await this.getLastItem(this.casOptions, this.scopeIdArray, "objectId");
-      let temp = [];
-      //递归出的数据会有重复,因为一个街道下面有两个社区的话就会循环push两遍,在这里去重
-      temp = this.sarr.filter(
-        (v) => !map.has(v.objectId) && map.set(v.objectId, 1)
-      );
-      for (let i in temp) {
-        this.scopeIdArray.push({
-          objectId: temp[i].objectId,
-          objectType: temp[i].objectType,
-          objectName: temp[i].objectName,
-        });
-      }
-      temp = [];
-      //  如果是编辑的话回填的数据会有数组字符串需要将不是对象属性的过滤掉
-      let arr = [];
-      // let isOk = false;
-      this.scopeIdArray.forEach((item) => {
-        if (typeof item != "string") {
-          arr.push(item);
-        }
-      });
-      return arr;
-    },
-    handleChangeFeedback(val) {
-      this.showFeedback = val;
-
-      // if (this.firstInitMap) {
-      //   this.$nextTick(() => {
-      //     this.initMap();
-      //   });
-      // }
-    },
-    async iniDefaultData() {
-      const { defaultData } = this;
-      if (defaultData) {
-        const { serviceOrgType, serviceOrgId, scopeIdArray } = defaultData;
-        if (serviceOrgType) {
-          this.formData.serviceOrgType = serviceOrgType;
-          await this.getServiceuserList(serviceOrgType, "add_demand");
-        }
-        if (serviceOrgId) {
-          this.formData.serviceOrgId = serviceOrgId;
-        }
-        if (scopeIdArray) {
-          this.scopeIdArray = scopeIdArray;
-          await nextTick();
-          this.handleChangeScope();
-        }
-      }
     },
 
-    handleClose() {
-      this.showPersonList = false;
-    },
-    handleOk() {
-      this.showPersonList = false;
+    data() {
+        let endDisabledDate = (time) => {
+            //这个关键属性我们一定要写在data的里面并且return的外面，这是动态改变区间的关键
+            let nowData = Date.now();
+            if (this.formData.serviceTimeStart) {
+                let serviceTimeStart = new Date(this.formData.serviceTimeStart);
+                return (
+                    time.getTime() < serviceTimeStart - 24 * 60 * 60 * 1000 ||
+                    time.getTime() === serviceTimeStart - 24 * 60 * 60 * 1000
+                );
+            } else {
+                return (time.getTime() > nowData || time.getTime() === nowData);
+            }
+        };
+        let startDisabledDate = (time) => {
+            //这个关键属性我们一定要写在data的里面并且return的外面，这是动态改变区间的关键
+            let nowData = Date.now() - 24 * 60 * 60 * 1000;
+            return time.getTime() < nowData;
+        };
+        return {
+            btnDisable: false,
+            casOptions: [],
+            scopeIdArray: [],
+            iscascaderShow: 0,
+
+            optionProps: {
+                multiple: true,
+                value: "objectId",
+                label: "objectName",
+                children: "children",
+                checkStrictly: true,
+                emitPath: false,
+            },
+            serviceStatusOptions: [{ 'label': '进行中', 'value': 'in_service' }, { 'label': '已完成', 'value': 'completed' }, { 'label': '取消', 'value': 'cancel' }],
+            keyWords: "",
+            formData: {
+                categoryCode: [],
+                parentCategoryCode: '',
+                resiSearchTagId: "", //查找享受服务人员
+                resiSearchTagName: "", //享受服务人员名称
+                serviceName: "", //服务事项
+                noticeApproches: [], //通知服务组织
+                policyId: "", //政策依据
+                serviceOrgType: "", //服务组织类型 社区自组织：community_org， 志愿者：ic_user_volunteer， 联建单位：party_unit
+                serviceOrgId: "", //服务组织Id
+                gridIdList: [], //
+                principalName: "", //经办人(责任人)姓名
+                principalContact: "", //经办人联系方式
+                serviceTimeStart: "", //服务起始时间yyyy-MM-dd
+                serviceTimeEnd: "", //服务截止时间yyyy-MM-dd
+                serviceStatus: "", //服务状态 in_service服务中；completed:已完成；cancel：取消
+                dataCategoryCode: "skill",
+                remark: "", //
+                attachments: []
+            },
+            feedbackFormData: {
+                serviceGoal: "", //	服务目标
+                serviceEffect: "", //	服务效果
+                servicePeopleNumber: null, //	服务人数
+                serviceStatus: "completed", //	服务状态。in_service服务中；completed:已完成
+                satisfaction: "", //满意度。不满意:bad、基本满意:good、非常满意:perfect
+                longitude: "", //	经度
+                latitude: "", //	维度
+                address: "",
+                fileList: [], //	附件列表
+            },
+            sarr: [],
+            dataRule: {
+                categoryCode: [
+                    { required: true, message: "服务类别不能为空", trigger: "change" },
+                ],
+                serviceName: [
+                    { required: true, message: "服务事项不能为空", trigger: "change" },
+                ],
+                serviceOrgId: [
+                    { required: true, message: "服务组织不能为空", trigger: "change" },
+                ],
+
+                serviceTimeStart: [
+                    { required: true, message: "服务时间不能为空", trigger: "change" },
+                ],
+                gridIdList: [
+                    { required: true, message: "服务范围不能为空", trigger: "change" },
+                ],
+                resiSearchTagId: [
+                    { required: true, message: "享受服务人员不能为空", trigger: "blur" },
+                ],
+            },
+
+            endPickerOptions: {
+                disabledDate: endDisabledDate,
+            },
+            startPickerOptions: {
+                disabledDate: startDisabledDate,
+            },
+
+            serviceOptions: [],
+            serviceOptiondList: [],
+            policyList: [],
+
+            fileList: [],
+            uploadUlr: window.SITE_CONFIG["apiURL"] + "/oss/file/uploadvariedfile",
+
+            showPersonList: false,
+            ruleList: [],
+            firstInitMap: true,
+
+            categrayOptions: [],
+            statusArray: [
+                {
+                    value: "in_service",
+                    label: "进行中",
+                },
+                {
+                    value: "completed",
+                    label: "已完成",
+                },
+            ],
+            satisfyArray: [
+                {
+                    value: "bad",
+                    label: "不满意",
+                },
+                {
+                    value: "good",
+                    label: "基本满意",
+                },
+                {
+                    value: "perfect",
+                    label: "非常满意",
+                },
+            ],
+            showLabelForm: false,
+            showFeedback: false,
+            demandOptions: []
+        };
     },
 
-    async getPolicyList() {
-      const url = "/governance/policy/policyList";
-
-      let params = {};
-
-      const { data, code, msg } = await requestPost(url, params);
-
-      if (code === 0) {
-        this.policyList = data;
-      } else {
-        this.$message.error(msg);
-      }
+    computed: {
+        feedbackDataRule() {
+            return {
+                // serviceGoal: [
+                //   { required: true, message: "服务目标不能为空", trigger: "blur" },
+                // ],
+
+                serviceEffect: [
+                    { required: true, message: "服务效果不能为空", trigger: "blur" },
+                ],
+                servicePeopleNumber: [
+                    { required: true, message: "服务人数不能为空", trigger: "blur" },
+                ],
+                serviceStatus: [
+                    { required: true, message: "服务状态不能为空", trigger: "blur" },
+                ],
+                satisfaction: [
+                    { required: true, message: "满意度不能为空", trigger: "blur" },
+                ],
+                address: [{ required: true, message: "地址不能为空", trigger: "blur" }],
+            };
+        },
     },
 
-    async getDictOptions() {
-      this.$http
-        .post("/sys/dict/data/dictlist", {
-          dictType: "user_demand_service_type",
-        })
-        .then(({ data: res }) => {
-          if (res.code !== 0) {
-            return this.$message.error(res.msg);
-          } else {
-            this.serviceOptions = res.data.filter(item=>item.value == 'party_unit'||item.value == 'community_org'||item.value == 'publicWelfare');
-          }
-        })
-        .catch(() => {
-          return this.$message.error("网络错误");
-        });
+    watch: {
+        "formData.serviceTimeEnd": function (val) {
+            if (val && val != "") {
+                let arrayTemp = val.split(" ");
+                this.formData.serviceTimeEnd = arrayTemp[0] + " 23:59:59";
+            }
+        },
     },
 
-    // 字典
-    // async getCategrayList() {
-    //   const url = "/sys/dict/data/dictlist";
-
-    //   let params = {
-    //     dictType: "ic_service_type",
-    //   };
+    components: { labelForm, UploadImages },
 
-    //   const { data, code, msg } = await requestPost(url, params);
+    async mounted() {
+        this.startLoading();
+        // 都已经重置了，还放在prop里干嘛，我不理解
+        this.categrayOptions = this.categrayArray;
 
-    //   if (code === 0) {
-    //     this.categrayOptions = data;
-    //   } else {
-    //     this.$message.error(msg);
-    //   }
-    // },
-    async handleServiceChange(type, val) {
-      if (val === "social_org") {
-        if (type === "add") await this.getServiceuserList(val);
-        else this.getServiceuserList(val);
-      } else this.getServiceuserList(val);
-    },
-
-    async getServiceuserList(serverOrgType) {
-      if (!serverOrgType) return false;
-      if (this.formData.categoryCode.length === 0) {
-        this.$message.error("请先选择服务类别!");
-        return;
-      }
-      const url = "/actual/base/serviceitem/listServerOrgNewTask";
-      let params = {
-        serverOrgCategoryCode: this.formData.categoryCode[1],
-        serverParentOrgCategoryCode:this.formData.categoryCode[0],
-        serverOrgType: serverOrgType,
-      };
-      let { data, code, msg } = await requestPost(url, params);
-      if (code == 0) {
-        this.serviceOptiondList = data;
-      } else if (code >= 8000) {
-        this.$message.error(msg);
-      }
-    },
+        // this.getCategrayList();
+        this.getDictOptions();
+        this.getPolicyList();
+        await this.loadScopeTree();
+        if (this.formType === "add") {
+            this.$refs.ref_form.resetFields();
+        } else if (this.formType == "edit") {
+            this.loadInfo();
+        }
+        await this.getDemandOptions()
+        await this.iniDefaultData();
+
+        this.endLoading();
+    },
+
+    methods: {
+        async getDemandOptions() {
+            this.$http
+                .post("/actual/base/serviceitem/listAllCategory")
+                .then(({ data: res }) => {
+                    if (res.code !== 0) {
+                        return this.$message.error(res.msg);
+                    } else {
+                        this.demandOptions = this.getFlagData(
+                            this.getTreeData(res.data),
+                            "usableFlag"
+                        ).filter((item) => item.categoryCode == '1043');
+                    }
+                })
+                .catch(() => {
+                    return this.$message.error("网络错误");
+                });
+        },
+        getFlagData(data, flag) {
+            if (!Array.isArray(data)) return [];
+            let arr1 = data.filter((item) => item[flag]);
+            let arr2 = arr1.map((item) => {
+                if (item.childCateList)
+                    return { ...item, childCateList: this.getFlagData(item.childCateList, flag) };
+                else return item;
+            });
+            // console.log('arrr-oppp', arr2)
+            return arr2;
+        },
+        getTreeData(data) {
+            if (!Array.isArray(data)) return [];
+            let arr = data.map((item) => {
+                let _item = {};
+                if (item.childCateList) {
+                    if (item.childCateList.length === 0)
+                        _item = { ...item, childCateList: undefined };
+                    else _item = { ...item, childCateList: this.getTreeData(item.childCateList) };
+                } else {
+                    _item = { ...item };
+                }
+                return _item;
+            });
+            return arr;
+        },
+        handelDisabledRules(v) {
+            if (!v) {
+                delete this.dataRule.resiSearchTagId;
+            } else {
+                var arr = [
+                    {
+                        required: true,
+                        message: "享受服务人员不能为空",
+                        trigger: "change",
+                    },
+                ];
+                this.dataRule.resiSearchTagId = arr;
+            }
+            console.log(this.dataRule);
+        },
+        //获取服务详情数据
+        async loadInfo() {
+            const url = "/governance/icServiceSkillRecord/detail";
+            let params = {
+                serviceRecordId: this.serviceRecordId,
+            };
+
+            const { data, code, msg } = await requestPost(url, params);
+
+            if (code === 0) {
+                this.formData = { ...data };
+                if (data.categoryCode) {
+                    this.formData.categoryCode = [data.parentCategoryCode, data.categoryCode];
+                } else {
+                    this.formData.categoryCode = [data.parentCategoryCode];
+                }
+                if (!data.noticeApproches) {
+                    this.formData.noticeApproches = [];
+                }
+                this.scopeIdArray = data.gridIdList.map(i => i.objectId);
+                this.feedbackFormData = { ...data.feedback };
+                await this.getServiceuserList(data.serviceOrgType);
+                await this.getTagName();
+                // this.fileList = []
+                // if (data.feedback && data.feedback.fileList && data.feedback.fileList.length > 0) {
+                //   data.feedback.fileList.forEach(element => {
+                //     let obj = {
+                //       name: element.name,
+                //       format: element.format,
+                //       url: element.url,
+                //     }
+                //     this.fileList.push(obj)
+                //   });
+                // }
+            } else {
+                this.$message.error(msg);
+            }
+        },
+        async getTagName() {
+            const url = "/governance/resiSearchTag/listResiSearchTags";
+            let params = {
+                pageSize: 99,
+            };
+            let { data, msg, code } = await requestPost(url, params);
+            if (code == 0) {
+                let showAddProduct = data.list.filter((item) => {
+                    return [this.formData.resiSearchTagId].includes(item.tagId);
+                });
+                this.formData.resiSearchTagName = showAddProduct[0].tagName;
+            } else {
+                this.$message.error(msg);
+            }
+        },
+        handleClickLabel() {
+            this.showLabelForm = true;
+            this.$nextTick(() => {
+                this.$refs["ref_label_form"].initForm("info");
+            });
+        },
+        addFormOk(val) {
+            this.showLabelForm = false;
+            this.formData.resiSearchTagId = val.tagId;
+            this.formData.resiSearchTagName = val.tagName;
+        },
+        addFormCancle() {
+            this.showLabelForm = false;
+        },
+        handleCloseTag() {
+            this.formData.resiSearchTagId = "";
+            this.formData.resiSearchTagName = "";
+        },
+        getLastItem(list, vals, key) {
+            let LIST = list || [];
+            for (let item of LIST) {
+                for (let i of vals) {
+                    if (item[key] === i) {
+                        this.sarr.push(item);
+                    } else if (item["objectType"] == "district") {
+                        this.getLastItem(item.children, vals, key);
+                    } else {
+                        this.getLastItem(item.children, vals, key);
+                    }
+                }
+            }
+        },
+        async handleTreeList() {
+            const map = new Map();
+            await this.getLastItem(this.casOptions, this.scopeIdArray, "objectId");
+            let temp = [];
+            //递归出的数据会有重复,因为一个街道下面有两个社区的话就会循环push两遍,在这里去重
+            temp = this.sarr.filter(
+                (v) => !map.has(v.objectId) && map.set(v.objectId, 1)
+            );
+            for (let i in temp) {
+                this.scopeIdArray.push({
+                    objectId: temp[i].objectId,
+                    objectType: temp[i].objectType,
+                    objectName: temp[i].objectName,
+                });
+            }
+            temp = [];
+            //  如果是编辑的话回填的数据会有数组字符串需要将不是对象属性的过滤掉
+            let arr = [];
+            // let isOk = false;
+            this.scopeIdArray.forEach((item) => {
+                if (typeof item != "string") {
+                    arr.push(item);
+                }
+            });
+            return arr;
+        },
+        handleChangeFeedback(val) {
+            this.showFeedback = val;
+
+            // if (this.firstInitMap) {
+            //   this.$nextTick(() => {
+            //     this.initMap();
+            //   });
+            // }
+        },
+        async iniDefaultData() {
+            const { defaultData } = this;
+            if (defaultData) {
+                const { serviceOrgType, serviceOrgId, scopeIdArray } = defaultData;
+                if (serviceOrgType) {
+                    this.formData.serviceOrgType = serviceOrgType;
+                    await this.getServiceuserList(serviceOrgType, "add_demand");
+                }
+                if (serviceOrgId) {
+                    this.formData.serviceOrgId = serviceOrgId;
+                }
+                if (scopeIdArray) {
+                    this.scopeIdArray = scopeIdArray;
+                    await nextTick();
+                    this.handleChangeScope();
+                }
+            }
+        },
 
-    // 获取服务范围树
-    async loadScopeTree() {
-      const url = "/gov/org/icServiceProject/service/serviceScopeTree";
-      // const url = 'http://yapi.elinkservice.cn/mock/245/gov/org/isServiceProject/service/serviceScopeTree'
-      let params = {};
+        handleClose() {
+            this.showPersonList = false;
+        },
+        handleOk() {
+            this.showPersonList = false;
+        },
 
-      const { data, code, msg } = await requestPost(url, params);
+        async getPolicyList() {
+            const url = "/governance/policy/policyList";
 
-      if (code === 0) {
-        ++this.iscascaderShow;
-        this.casOptions = [];
-        this.scopeIdArray = [];
-        this.casOptions.push(data);
-      } else {
-        this.$message.error(rspMsg);
-      }
-    },
+            let params = {};
 
-    handleChangeScope(value) {
-      this.formData.gridIdList = [];
-      let selArray = this.$refs["myCascader"].getCheckedNodes();
-      console.log("handleChangeScope", selArray);
-      selArray.forEach((element) => {
-        let obj = {
-          objectType: element.data.objectType,
-          objectId: element.data.objectId,
-          objectName: element.data.objectName,
-        };
-        this.formData.gridIdList.push(obj);
-      });
-    },
+            const { data, code, msg } = await requestPost(url, params);
 
-    async handleComfirm() {
-      if (this.formType === "add") {
-        this.handleAdd();
-      } else if (this.formType === "feedback") {
-        this.handleFeedback();
-      } else if (this.formType === "edit") {
-        this.handleAdd();
-      }
-    },
+            if (code === 0) {
+                this.policyList = data;
+            } else {
+                this.$message.error(msg);
+            }
+        },
 
-    async handleAdd() {
-      this.btnDisable = true;
-      setTimeout(() => {
-        this.btnDisable = false;
-      }, 10000);
-      this.formData.gridIdList = await this.handleTreeList();
-      this.$refs["ref_form"].validate((valid, messageObj) => {
-        if (!valid) {
-          app.util.validateRule(messageObj);
-          this.btnDisable = false;
-        } else {
-          var oDate1 = new Date(this.formData.serviceTimeStart);
-          var oDate2 = new Date(this.formData.serviceTimeEnd);
-          if (oDate1.getTime() > oDate2.getTime()) {
-            this.$message.error("服务截止时间必须大于服务开始时间");
-            return false;
-          }
-          this.addFuwu();
-        }
-      });
-    },
-    async handleFeedback() {
-      this.btnDisable = true;
-      setTimeout(() => {
-        this.btnDisable = false;
-      }, 10000);
+        async getDictOptions() {
+            this.$http
+                .post("/sys/dict/data/dictlist", {
+                    dictType: "user_demand_service_type",
+                })
+                .then(({ data: res }) => {
+                    if (res.code !== 0) {
+                        return this.$message.error(res.msg);
+                    } else {
+                        this.serviceOptions = res.data.filter(item => item.value == 'party_unit' || item.value == 'community_org' || item.value == 'publicWelfare');
+                    }
+                })
+                .catch(() => {
+                    return this.$message.error("网络错误");
+                });
+        },
 
-      this.$refs["ref_form_feedback"].validate((valid, messageObj) => {
-        if (!valid) {
-          app.util.validateRule(messageObj);
-          this.btnDisable = false;
-        } else {
-          this.addFeecback();
-        }
-      });
-    },
-    async addFeecback() {
-      // this.feedbackFormData.fileList = [];
-      // this.feedbackFormData.fileList = [...this.fileList];
-      this.feedbackFormData.serviceRecordId = this.serviceRecordId;
+        // 字典
+        // async getCategrayList() {
+        //   const url = "/sys/dict/data/dictlist";
+
+        //   let params = {
+        //     dictType: "ic_service_type",
+        //   };
+
+        //   const { data, code, msg } = await requestPost(url, params);
+
+        //   if (code === 0) {
+        //     this.categrayOptions = data;
+        //   } else {
+        //     this.$message.error(msg);
+        //   }
+        // },
+        async handleServiceChange(type, val) {
+            if (val === "social_org") {
+                if (type === "add") await this.getServiceuserList(val);
+                else this.getServiceuserList(val);
+            } else this.getServiceuserList(val);
+        },
 
-      console.log(this.feedbackFormData);
+        async getServiceuserList(serverOrgType) {
+            if (!serverOrgType) return false;
+            if (this.formData.categoryCode.length === 0) {
+                this.$message.error("请先选择服务类别!");
+                return;
+            }
+            const url = "/actual/base/serviceitem/listServerOrgNewTask";
+            let params = {
+                serverOrgCategoryCode: this.formData.categoryCode[1],
+                serverParentOrgCategoryCode: this.formData.categoryCode[0],
+                serverOrgType: serverOrgType,
+            };
+            let { data, code, msg } = await requestPost(url, params);
+            if (code == 0) {
+                this.serviceOptiondList = data;
+            } else if (code >= 8000) {
+                this.$message.error(msg);
+            }
+        },
 
-      const url = "/governance/icServiceFeedbackV2/add";
-      let params = {
-        ...this.feedbackFormData,
-      };
+        // 获取服务范围树
+        async loadScopeTree() {
+            const url = "/gov/org/icServiceProject/service/serviceScopeTree";
+            // const url = 'http://yapi.elinkservice.cn/mock/245/gov/org/isServiceProject/service/serviceScopeTree'
+            let params = {};
+
+            const { data, code, msg } = await requestPost(url, params);
+
+            if (code === 0) {
+                ++this.iscascaderShow;
+                this.casOptions = [];
+                this.scopeIdArray = [];
+                this.casOptions.push(data);
+            } else {
+                this.$message.error(rspMsg);
+            }
+        },
 
-      const { data, code, msg,internalMsg } = await requestPost(url, params);
+        handleChangeScope(value) {
+            this.formData.gridIdList = [];
+            let selArray = this.$refs["myCascader"].getCheckedNodes();
+            console.log("handleChangeScope", selArray);
+            selArray.forEach((element) => {
+                let obj = {
+                    objectType: element.data.objectType,
+                    objectId: element.data.objectId,
+                    objectName: element.data.objectName,
+                };
+                this.formData.gridIdList.push(obj);
+            });
+        },
 
-      if (code === 0) {
-        this.$message.success("反馈成功");
-        this.resetData();
-        this.$emit("handleOk");
-      } else {
-        this.$message.error(internalMsg);
-      }
-    },
-    async addFuwu() {
-      if (this.showFeedback) {
-        this.formData.feedback = { ...this.feedbackFormData };
-      } else {
-        this.formData.feedback = null;
-      }
-      let params = {
-        categoryCode:this.formData.categoryCode[1]?this.formData.categoryCode[1]:'',
-        parentCategoryCode:this.formData.categoryCode[0],
-        resiSearchTagId: this.formData.resiSearchTagId,
-        resiSearchTagName: this.formData.resiSearchTagName,
-        serviceName: this.formData.serviceName,
-        noticeApproches: this.formData.noticeApproches,
-        policyId: this.formData.policyId,
-        serviceOrgType: this.formData.serviceOrgType,
-        serviceOrgId: this.formData.serviceOrgId,
-        objList: this.formData.gridIdList,
-        principalName: this.formData.principalName,
-        principalContact: this.formData.principalContact,
-        serviceTimeStart: this.formData.serviceTimeStart,
-        serviceTimeEnd: this.formData.serviceTimeEnd,
-        remark: this.formData.remark,
-        feedback:this.formData.feedback,
-        serviceRecordId:this.serviceRecordId
-      };
-      let url = "";
-      if (this.formType != "edit") {
-        url = "/governance/icServiceSkillRecord/searchAdd";
-      } else {
-        url = "/governance/icServiceSkillRecord/searchUpdate";
-        params.attachments = this.formData.attachments
-      }
-      // const url = 'http://yapi.elinkservice.cn/mock/245/governance/icServiceProject/service/initiate'
+        async handleComfirm() {
+            if (this.formType === "add") {
+                this.handleAdd();
+            } else if (this.formType === "feedback") {
+                this.handleFeedback();
+            } else if (this.formType === "edit") {
+                this.handleAdd();
+            }
+        },
 
-      const { data, code, msg } = await requestPost(url, params);
-      if (code === 0) {
-        this.$message.success("发起成功");
-        this.resetData();
-        this.$emit("handleOk");
-      } else {
-        this.$message.error(msg);
-      }
-    },
+        async handleAdd() {
+            this.btnDisable = true;
+            setTimeout(() => {
+                this.btnDisable = false;
+            }, 10000);
+            this.formData.gridIdList = await this.handleTreeList();
+            this.$refs["ref_form"].validate((valid, messageObj) => {
+                if (!valid) {
+                    app.util.validateRule(messageObj);
+                    this.btnDisable = false;
+                } else {
+                    var oDate1 = new Date(this.formData.serviceTimeStart);
+                    var oDate2 = new Date(this.formData.serviceTimeEnd);
+                    if (oDate1.getTime() > oDate2.getTime()) {
+                        this.$message.error("服务截止时间必须大于服务开始时间");
+                        return false;
+                    }
+                    this.addFuwu();
+                }
+            });
+        },
+        async handleFeedback() {
+            this.btnDisable = true;
+            setTimeout(() => {
+                this.btnDisable = false;
+            }, 10000);
+
+            this.$refs["ref_form_feedback"].validate((valid, messageObj) => {
+                if (!valid) {
+                    app.util.validateRule(messageObj);
+                    this.btnDisable = false;
+                } else {
+                    this.addFeecback();
+                }
+            });
+        },
+        async addFeecback() {
+            // this.feedbackFormData.fileList = [];
+            // this.feedbackFormData.fileList = [...this.fileList];
+            this.feedbackFormData.serviceRecordId = this.serviceRecordId;
+
+            console.log(this.feedbackFormData);
+
+            const url = "/governance/icServiceFeedbackV2/add";
+            let params = {
+                ...this.feedbackFormData,
+            };
+
+            const { data, code, msg, internalMsg } = await requestPost(url, params);
+
+            if (code === 0) {
+                this.$message.success("反馈成功");
+                this.resetData();
+                this.$emit("handleOk");
+            } else {
+                this.$message.error(internalMsg);
+            }
+        },
+        async addFuwu() {
+            if (this.showFeedback) {
+                this.formData.feedback = { ...this.feedbackFormData };
+            } else {
+                this.formData.feedback = null;
+            }
+            let params = {
+                categoryCode: this.formData.categoryCode[1] ? this.formData.categoryCode[1] : '',
+                parentCategoryCode: this.formData.categoryCode[0],
+                resiSearchTagId: this.formData.resiSearchTagId,
+                resiSearchTagName: this.formData.resiSearchTagName,
+                serviceName: this.formData.serviceName,
+                noticeApproches: this.formData.noticeApproches,
+                policyId: this.formData.policyId,
+                serviceOrgType: this.formData.serviceOrgType,
+                serviceOrgId: this.formData.serviceOrgId,
+                objList: this.formData.gridIdList,
+                principalName: this.formData.principalName,
+                principalContact: this.formData.principalContact,
+                serviceTimeStart: this.formData.serviceTimeStart,
+                serviceTimeEnd: this.formData.serviceTimeEnd,
+                serviceStatus: this.formData.serviceStatus,
+                remark: this.formData.remark,
+                feedback: this.formData.feedback,
+                serviceRecordId: this.serviceRecordId
+            };
+            let url = "";
+            if (this.formType != "edit") {
+                url = "/governance/icServiceSkillRecord/searchAdd";
+            } else {
+                url = "/governance/icServiceSkillRecord/searchUpdate";
+                params.attachments = this.formData.attachments
+            }
+            // const url = 'http://yapi.elinkservice.cn/mock/245/governance/icServiceProject/service/initiate'
+
+            const { data, code, msg } = await requestPost(url, params);
+            if (code === 0) {
+                this.$message.success("发起成功");
+                this.resetData();
+                this.$emit("handleOk");
+            } else {
+                this.$message.error(msg);
+            }
+        },
 
-    handleCancle() {
-      this.resetData();
-      this.$emit("handleClose");
-    },
+        handleCancle() {
+            this.resetData();
+            this.$emit("handleClose");
+        },
 
-    resetData() {
-      this.formData = {
-        categoryCode:[],
-        parentCategoryCode:'',
-        gridIdList: [], //
-        principalName: "", //经办人(责任人)姓名
-        principalContact: "", //经办人联系方式
-        serviceTimeStart: "", //服务起始时间yyyy-MM-dd
-        serviceTimeEnd: "", //服务截止时间yyyy-MM-dd
-        remark: "", //
-      };
-      this.feedbackFormData = {
-        serviceGoal: "", //	服务目标
-        serviceEffect: "", //	服务效果
-        servicePeopleNumber: null, //	服务人数
-        serviceStatus: "completed", //	服务状态。in_service服务中；completed:已完成
-        satisfaction: "", //满意度。不满意:bad、基本满意:good、非常满意:perfect
-        longitude: "", //	经度
-        latitude: "", //	维度
-        address: "",
-        fileList: [], //	附件列表
-      };
-    },
-    // 开启加载动画
-    startLoading() {
-      loading = Loading.service({
-        lock: true, // 是否锁定
-        text: "正在加载……", // 加载中需要显示的文字
-        background: "rgba(0,0,0,.7)", // 背景颜色
-      });
-    },
-    // 结束加载动画
-    endLoading() {
-      // clearTimeout(timer);
-      if (loading) {
-        loading.close();
-      }
+        resetData() {
+            this.formData = {
+                categoryCode: [],
+                parentCategoryCode: '',
+                gridIdList: [], //
+                principalName: "", //经办人(责任人)姓名
+                principalContact: "", //经办人联系方式
+                serviceTimeStart: "", //服务起始时间yyyy-MM-dd
+                serviceTimeEnd: "", //服务截止时间yyyy-MM-dd
+                remark: "", //
+            };
+            this.feedbackFormData = {
+                serviceGoal: "", //	服务目标
+                serviceEffect: "", //	服务效果
+                servicePeopleNumber: null, //	服务人数
+                serviceStatus: "completed", //	服务状态。in_service服务中；completed:已完成
+                satisfaction: "", //满意度。不满意:bad、基本满意:good、非常满意:perfect
+                longitude: "", //	经度
+                latitude: "", //	维度
+                address: "",
+                fileList: [], //	附件列表
+            };
+        },
+        // 开启加载动画
+        startLoading() {
+            loading = Loading.service({
+                lock: true, // 是否锁定
+                text: "正在加载……", // 加载中需要显示的文字
+                background: "rgba(0,0,0,.7)", // 背景颜色
+            });
+        },
+        // 结束加载动画
+        endLoading() {
+            // clearTimeout(timer);
+            if (loading) {
+                loading.close();
+            }
+        },
     },
-  },
 };
 </script>
   
-    <style lang="scss" scoped>
+<style lang="scss" scoped>
 @import "@/assets/scss/modules/management/form-main.scss";
 @import "@/assets/scss/modules/visual/a_customize.scss";
 
 .form-item::v-deep .el-form-item__label {
-  color: #fff;
+    color: #fff;
 }
+
 .form-item {
-  .el-radio {
-    color: #fff;
-  }
+    .el-radio {
+        color: #fff;
+    }
 
-  .el-checkbox {
-    color: #fff;
-  }
+    .el-checkbox {
+        color: #fff;
+    }
 }
 </style>
   
diff --git a/src/views/modules/communityService/jinengzhaoren/editForm.vue b/src/views/modules/communityService/jinengzhaoren/editForm.vue
index 4d1ec4d08..ec9dc8636 100644
--- a/src/views/modules/communityService/jinengzhaoren/editForm.vue
+++ b/src/views/modules/communityService/jinengzhaoren/editForm.vue
@@ -14,7 +14,7 @@
                         style="display: block">
             <span>{{formData.serviceName}}</span>
             <!-- <el-select class="item_width_1"
-                       v-model="formData.serviceProjectId"
+                       v-model.trim="formData.serviceProjectId"
                        placeholder="请选择"
                        filterable
                        clearable>
@@ -33,7 +33,7 @@
                         style="display: block">
             <span>{{serviceOrgName}}</span>
             <!-- <el-select class="item_width_1"
-                       v-model="formData.serviceOrgId"
+                       v-model.trim="formData.serviceOrgId"
                        placeholder="请选择"
                        filterable
                        clearable>
@@ -56,7 +56,7 @@
             </div>
             <!-- <el-cascader class="item_width_1"
                          ref="myCascader"
-                         v-model="scopeIdArray"
+                         v-model.trim="scopeIdArray"
                          :key="iscascaderShow"
                          :options="casOptions"
                          :props="optionProps"
@@ -69,7 +69,7 @@
                         label-width="150px"
                         style="display: block">
             <el-select :disabled="formType==='detail'"
-                       v-model="formData.policyId"
+                       v-model.trim="formData.policyId"
                        class="input-width-small"
                        placeholder="请选择"
                        clearable>
@@ -93,7 +93,7 @@
             <el-input :disabled="formType==='detail'"
                       class="item_width_1"
                       placeholder="请输入经办人姓名"
-                      v-model="formData.principalName">
+                      v-model.trim="formData.principalName">
             </el-input>
           </el-form-item>
           <el-form-item label="联系方式"
@@ -103,11 +103,11 @@
             <el-input :disabled="formType==='detail'"
                       class="item_width_1"
                       placeholder="请输入联系方式"
-                      v-model="formData.principalContact">
+                      v-model.trim="formData.principalContact">
             </el-input>
           </el-form-item>
           <el-form-item label="指派服务" label-width="150px">
-             <el-switch v-model="assignSwitch"> </el-switch>
+             <el-switch v-model.trim="assignSwitch"> </el-switch>
            </el-form-item>
 
             <el-form-item
@@ -117,7 +117,7 @@
             style="display: block"
             v-show="this.assignSwitch"
              >
-             <input type="text" v-model="formData.resiSearchTagId" v-show="false">
+             <input type="text" v-model.trim="formData.resiSearchTagId" v-show="false">
               <template  v-if="this.resiSearchTagName">
                 <el-tag   @close="handleCloseTag"  closable style="margin-right:10px;">
                 {{this.resiSearchTagName }}
@@ -133,7 +133,7 @@
                         prop="serviceTimeStart"
                         style="display: block">
             <el-date-picker :disabled="formType==='detail'"
-                            v-model="formData.serviceTimeStart"
+                            v-model.trim="formData.serviceTimeStart"
                             :picker-options="startPickerOptions"
                             class="item_width_2"
                             type="date"
@@ -143,7 +143,7 @@
             </el-date-picker>
             <span class="u-data-tag">至</span>
             <el-date-picker :disabled="formType==='detail'"
-                            v-model="formData.serviceTimeEnd"
+                            v-model.trim="formData.serviceTimeEnd"
                             :picker-options="endPickerOptions"
                             class="item_width_2 u-data-tag"
                             type="date"
@@ -164,7 +164,7 @@
                       show-word-limit
                       :rows="3"
                       placeholder="请输入备注，不超过500字"
-                      v-model="formData.remark"></el-input>
+                      v-model.trim="formData.remark"></el-input>
           </el-form-item>
 
         </el-form>
@@ -188,7 +188,7 @@
                         show-word-limit
                         :rows="3"
                         placeholder="请输入服务目标，不超过1000字"
-                        v-model="feedbackFormData.serviceGoal"></el-input>
+                        v-model.trim="feedbackFormData.serviceGoal"></el-input>
             </el-form-item>
 
             <el-form-item label="服务效果"
@@ -201,7 +201,7 @@
                         show-word-limit
                         :rows="3"
                         placeholder="请输入服务效果，不超过1000字"
-                        v-model="feedbackFormData.serviceEffect"></el-input>
+                        v-model.trim="feedbackFormData.serviceEffect"></el-input>
             </el-form-item>
 
             <el-form-item label="服务人数"
@@ -209,7 +209,7 @@
                           prop="servicePeopleNumber"
                           label-width="150px">
               <el-input-number class="item_width_2"
-                               v-model="feedbackFormData.servicePeopleNumber"
+                               v-model.trim="feedbackFormData.servicePeopleNumber"
                                :min="0"
                                :max="9999"
                                label="服务人数"></el-input-number>
@@ -221,7 +221,7 @@
                           prop="serviceStatus">
               <span>已完成</span>
               <!-- <el-select class="item_width_1"
-                         v-model="feedbackFormData.serviceStatus"
+                         v-model.trim="feedbackFormData.serviceStatus"
                          placeholder="全部"
                          clearable>
                 <el-option v-for="item in statusArray"
@@ -237,7 +237,7 @@
                           label-width="150px"
                           prop="satisfaction">
               <el-select class="item_width_2"
-                         v-model="feedbackFormData.satisfaction"
+                         v-model.trim="feedbackFormData.satisfaction"
                          placeholder="全部"
                          clearable>
                 <el-option v-for="item in satisfyArray"
@@ -253,7 +253,7 @@
                           label-width="150px"
                           style="display: block">
               <el-input class="item_width_1"
-                        v-model="feedbackFormData.address"></el-input>
+                        v-model.trim="feedbackFormData.address"></el-input>
             </el-form-item>
             <!-- <el-form-item label="地图位置"
                           label-width="150px"
@@ -268,7 +268,7 @@
                     <el-input maxlength="50"
                               size="mini"
                               placeholder="请输入关键字"
-                              v-model="keyWords">
+                              v-model.trim="keyWords">
                     </el-input>
                     <el-button style="margin-left: 10px"
                                type="primary"
diff --git a/src/views/modules/communityService/jinengzhaoren/index.vue b/src/views/modules/communityService/jinengzhaoren/index.vue
index 9775ac1b3..6b8792518 100644
--- a/src/views/modules/communityService/jinengzhaoren/index.vue
+++ b/src/views/modules/communityService/jinengzhaoren/index.vue
@@ -8,7 +8,7 @@
                  :label-width="'100px'">
                  <el-form-item label="服务类别" prop="categoryCode">
                     <el-cascader
-                      v-model="formData.categoryCode"
+                      v-model.trim="formData.categoryCode"
                       class="u-item-width-daterange2"
                       size="small"
                       :options="searchdemandOptions"
@@ -20,7 +20,7 @@
 
             <el-form-item label="服务时间"
                           prop="serviceTimeStart">
-              <el-date-picker v-model="formData.serviceTimeStart"
+              <el-date-picker v-model.trim="formData.serviceTimeStart"
                               :picker-options="startPickerOptions"
                               class="u-item-width-daterange"
                               size="small"
@@ -30,7 +30,7 @@
                               placeholder="开始时间">
               </el-date-picker>
               <span class="u-data-tag">至</span>
-              <el-date-picker v-model="formData.serviceTimeEnd"
+              <el-date-picker v-model.trim="formData.serviceTimeEnd"
                               :picker-options="endPickerOptions"
                               class="u-item-width-daterange u-data-tag"
                               size="small"
@@ -44,7 +44,7 @@
 
             <el-form-item label="服务事项"
                           prop="serviceName">
-              <el-input v-model="formData.serviceName"
+              <el-input v-model.trim="formData.serviceName"
                         class="u-item-width-normal"
                         size="small"
                         clearable
@@ -54,7 +54,7 @@
 
             <el-form-item label="服务组织"
                           prop="serviceOrgType">
-              <el-select v-model="formData.serviceOrgType"
+              <el-select v-model.trim="formData.serviceOrgType"
                          class="u-item-width-daterange"
                          placeholder="请选择"
                          size="small"
@@ -66,7 +66,7 @@
                            :value="item.value">
                 </el-option>
               </el-select>
-              <el-select v-model="formData.serviceOrgId"
+              <el-select v-model.trim="formData.serviceOrgId"
                          class="u-item-width-daterange u-data-tag"
                          filterable
                          placeholder="请选择"
@@ -85,7 +85,7 @@
             <el-form-item label="服务状态"
                           prop="serviceStatus">
               <el-select class="u-item-width-normal"
-                         v-model="formData.serviceStatus"
+                         v-model.trim="formData.serviceStatus"
                          placeholder="全部"
                          size="small"
                          clearable>
@@ -100,7 +100,7 @@
             <el-form-item label="满意度"
                           prop="satisfaction">
               <el-select class="u-item-width-normal"
-                         v-model="formData.satisfaction"
+                         v-model.trim="formData.satisfaction"
                          placeholder="全部"
                          size="small"
                          clearable>
diff --git a/src/views/modules/communityService/jinengzhaoren/personList.vue b/src/views/modules/communityService/jinengzhaoren/personList.vue
index 8db053502..74f4e7567 100644
--- a/src/views/modules/communityService/jinengzhaoren/personList.vue
+++ b/src/views/modules/communityService/jinengzhaoren/personList.vue
@@ -17,7 +17,7 @@
         </el-form-item>
         <el-form-item label="人员姓名" prop="title">
           <el-input
-              v-model="searchFormData.name"
+              v-model.trim="searchFormData.name"
               class="u-item-width-normal"
               size="small"
               clearable
@@ -27,7 +27,7 @@
 
         <el-form-item label="手机号" prop="title">
           <el-input
-              v-model="searchFormData.mobile"
+              v-model.trim="searchFormData.mobile"
               class="u-item-width-normal"
               size="small"
               clearable
@@ -37,7 +37,7 @@
 
         <el-form-item label="身份证号" prop="title">
           <el-input
-              v-model="searchFormData.idCard"
+              v-model.trim="searchFormData.idCard"
               class="u-item-width-normal"
               size="small"
               clearable
@@ -47,7 +47,7 @@
 
         <el-form-item label="享受服务次数" prop="title">
           <el-input
-              v-model="searchFormData.serveTimes"
+              v-model.trim="searchFormData.serveTimes"
               class="u-item-width-normal"
               size="small"
               clearable
@@ -56,7 +56,7 @@
         </el-form-item>
 
         <el-form-item label="家庭住址" prop="title">
-          <el-select v-model="searchFormData.villageId" placeholder="请选择小区"
+          <el-select v-model.trim="searchFormData.villageId" placeholder="请选择小区"
                      @change="handleQuarterSelectorsChange" clearable>
             <el-option
                 v-for="item in quartersSelectItems"
@@ -65,7 +65,7 @@
                 :value="item.value">
             </el-option>
           </el-select>
-          <el-select v-model="searchFormData.buildId" placeholder="请选择楼栋"
+          <el-select v-model.trim="searchFormData.buildId" placeholder="请选择楼栋"
                      @change="handleBuildSelectorsChange" clearable>
             <el-option
                 v-for="item in buildingSelectItems"
@@ -74,7 +74,7 @@
                 :value="item.value">
             </el-option>
           </el-select>
-          <el-select v-model="searchFormData.unitId" placeholder="请选择单元"
+          <el-select v-model.trim="searchFormData.unitId" placeholder="请选择单元"
                      @change="handleUnitSelectorsChange" clearable>
             <el-option
                 v-for="item in unitSelectItems"
@@ -83,7 +83,7 @@
                 :value="item.value">
             </el-option>
           </el-select>
-          <el-select v-model="searchFormData.homeId" placeholder="请选择房屋"
+          <el-select v-model.trim="searchFormData.homeId" placeholder="请选择房屋"
                      @change="handleUnitSelectorsChange" clearable>
             <el-option
                 v-for="item in homeSelectItems"
diff --git a/src/views/modules/communityService/labelConfig/addForm.vue b/src/views/modules/communityService/labelConfig/addForm.vue
index 92cc9f65d..d298def0c 100644
--- a/src/views/modules/communityService/labelConfig/addForm.vue
+++ b/src/views/modules/communityService/labelConfig/addForm.vue
@@ -10,7 +10,7 @@
       <!--  v-if="!formState&& addFormLabel" -->
       <el-form-item label="标签名称" label-width="200px" prop="tagName">
         <el-autocomplete
-          v-model="formData.tagName"
+          v-model.trim="formData.tagName"
           value-key="tagName"
           :fetch-suggestions="querySearchAsync"
           @blur="handelChangeTagName"
@@ -24,7 +24,7 @@
       >
       <!-- <el-form-item label="标签名称（新增）" label-width="100px" prop="tagName" v-else>
         <el-input
-          v-model="formData.tagName"
+          v-model.trim="formData.tagName"
           placeholder="请输入内容"
           @blur="handelChangeTagName"
           clearable
@@ -38,7 +38,7 @@
       <el-table-column label="选择数据源" align="center" width="120">
         <template slot-scope="scope">
           <el-select
-            v-model="scope.row.dataSource"
+            v-model.trim="scope.row.dataSource"
             placeholder="请选择"
             @change="handleChangeSource(scope.row, scope.$index)"
             clearable
@@ -57,7 +57,7 @@
       <el-table-column label="字段类别" align="center" width="120">
         <template slot-scope="scope" v-if="scope.row.dataSource == 'resi'||scope.row.dataSource == 'house'">
           <el-select
-            v-model="scope.row.itemGroupId"
+            v-model.trim="scope.row.itemGroupId"
             placeholder="请选择"
             clearable
             @change="handleChangeFieldsType(scope.row, scope.$index)"
@@ -75,7 +75,7 @@
       <el-table-column label="字段名称" align="center" width="120">
         <template slot-scope="scope">
           <el-select
-            v-model="scope.row.itemId"
+            v-model.trim="scope.row.itemId"
             placeholder="请选择"
             @change="handleChangeFieldsName(scope.row, scope.$index)"
             @clear="handleClearItemId(scope.row, scope.$index)"
@@ -96,7 +96,7 @@
       <el-table-column label="比较符" align="center" width="120">
         <template slot-scope="scope">
           <el-select
-            v-model="scope.row.queryType"
+            v-model.trim="scope.row.queryType"
             placeholder="请选择"
             clearable
             @change="changeFormState = true"
@@ -120,7 +120,7 @@
                 item.itemType == 'radio' ||
                 item.itemType == 'checkbox'
               "
-              v-model="scope.row.colVal"
+              v-model.trim="scope.row.colVal"
               @change="changeFormState = true"
               placeholder="请选择"
               clearable
@@ -137,7 +137,7 @@
               v-else-if="
                 item.itemType === 'input' || item.itemType === 'textarea'
               "
-              v-model="scope.row.colVal"
+              v-model.trim="scope.row.colVal"
               @change="changeFormState = true"
               placeholder="请输入"
               clearable
@@ -146,7 +146,7 @@
             <el-input-number
               v-else-if="item.itemType === 'inputNum'"
               class="item_width_2"
-              v-model="scope.row.colVal"
+              v-model.trim="scope.row.colVal"
               @change="changeFormState = true"
               :min="0"
               size="mini"
@@ -157,7 +157,7 @@
                 item.itemType === 'datepicker' || item.itemType === 'date'
               "
               @change="changeFormState = true"
-              v-model="scope.row.colVal"
+              v-model.trim="scope.row.colVal"
               class="item_width_2"
               type="datetime"
               value-format="yyyy-MM-dd HH:mm:ss"
@@ -170,7 +170,7 @@
               class="item_width_2"
               size="mini"
               placeholder="请输入"
-              v-model="scope.row.colVal"
+              v-model.trim="scope.row.colVal"
               @change="changeFormState = true"
             >
             </el-input>
@@ -183,7 +183,7 @@
           v-if="scope.$index != tableData.length - 1"
         >
           <el-select
-            v-model="scope.row.nextLogicalRel"
+            v-model.trim="scope.row.nextLogicalRel"
             placeholder="请选择"
             @change="changeFormState = true"
             clearable
diff --git a/src/views/modules/communityService/labelConfig/index.vue b/src/views/modules/communityService/labelConfig/index.vue
index a8f623fa4..b02f8e45e 100644
--- a/src/views/modules/communityService/labelConfig/index.vue
+++ b/src/views/modules/communityService/labelConfig/index.vue
@@ -3,7 +3,7 @@
     <div class="m-search">
       <el-form :inline="true" :model="formData" ref="ref_searchform" :label-width="'120px'">
         <el-form-item label="标签名称" prop="tagName">
-          <el-input v-model="formData.tagName" size="small" class="u-item-width-normal" clearable placeholder="请输入">
+          <el-input v-model.trim="formData.tagName" size="small" class="u-item-width-normal" clearable placeholder="请输入">
           </el-input>
         </el-form-item>
         <el-row type="flex">
diff --git a/src/views/modules/communityService/measure/index.vue b/src/views/modules/communityService/measure/index.vue
index 78bb6247b..f7b99f1e7 100644
--- a/src/views/modules/communityService/measure/index.vue
+++ b/src/views/modules/communityService/measure/index.vue
@@ -11,7 +11,7 @@
       >
         <el-form-item label="所属网格" prop="gridId">
           <el-select
-            v-model="searchForm.gridId"
+            v-model.trim="searchForm.gridId"
             class="u-item-width-normal"
             size="small"
             filterable
@@ -31,7 +31,7 @@
         </el-form-item>
         <el-form-item label="需求分类" prop="categoryCode">
           <el-cascader
-            v-model="searchForm.categoryCode"
+            v-model.trim="searchForm.categoryCode"
             class="u-item-width-daterange2"
             size="small"
             :options="searchdemandOptions"
@@ -39,7 +39,7 @@
             clearable
             @change="handleCateCHange"
           ></el-cascader>
-          <!-- <el-select v-model="searchForm.categoryCode" filterable placeholder="请选择" clearable>
+          <!-- <el-select v-model.trim="searchForm.categoryCode" filterable placeholder="请选择" clearable>
                 <el-option
                   v-for="item in demandOptions"
                   :key="item.value"
@@ -52,7 +52,7 @@
           <el-input
             size="small"
             class="u-item-width-normal"
-            v-model="searchForm.demandUserName"
+            v-model.trim="searchForm.demandUserName"
             placeholder="请输入内容"
             clearable=""
           ></el-input>
@@ -61,7 +61,7 @@
           <el-select
             size="small"
             class="u-item-width-normal"
-            v-model="searchForm.status"
+            v-model.trim="searchForm.status"
             filterable
             placeholder="请选择"
             clearable
@@ -77,7 +77,7 @@
         </el-form-item>
         <el-form-item label="上报时间" prop="reportStartTime">
           <el-date-picker
-            v-model="reportTime"
+            v-model.trim="reportTime"
             size="small"
             type="daterange"
             class="u-item-width-daterange2"
@@ -92,7 +92,7 @@
         </el-form-item>
         <el-form-item label="服务类型" prop="serviceType">
           <el-select
-            v-model="searchForm.serviceType"
+            v-model.trim="searchForm.serviceType"
             class="u-item-width-normal"
             size="small"
             filterable
@@ -111,7 +111,7 @@
         </el-form-item>
         <el-form-item prop="serverId">
           <el-select
-            v-model="searchForm.serverId"
+            v-model.trim="searchForm.serverId"
             filterable
             :disabled="searchForm.serviceType ? false : true"
             placeholder="请选择"
@@ -128,7 +128,7 @@
         </el-form-item>
         <el-form-item label="服务时间" prop="wantServiceStartTime">
           <el-date-picker
-            v-model="serviceTime"
+            v-model.trim="serviceTime"
             size="small"
             class="u-item-width-daterange2"
             type="daterange"
@@ -315,7 +315,7 @@
         <el-form-item label="所属网格" prop="gridId">
           <el-input
             v-if="disabled"
-            v-model="form.gridName"
+            v-model.trim="form.gridName"
             :disabled="disabled"
             size="small"
             class="input-width-small"
@@ -323,7 +323,7 @@
           <!-- <span >{{ form.gridName }}</span> -->
           <el-select
             v-else
-            v-model="form.gridId"
+            v-model.trim="form.gridId"
             filterable
             placeholder="请选择"
             size="small"
@@ -344,13 +344,13 @@
         <el-form-item label="需求分类" prop="categoryCode">
           <el-input
             v-if="disabled"
-            v-model="form.categoryName"
+            v-model.trim="form.categoryName"
             :disabled="disabled"
             class="input-width-min"
           ></el-input>
           <el-cascader
             v-else
-            v-model="form.categoryCode"
+            v-model.trim="form.categoryCode"
             :options="demandOptions"
             :props="{label: 'categoryName',value: 'categoryCode',children: 'childCateList'}"
             :disabled="disabled"
@@ -359,7 +359,7 @@
             class="input-width-small"
             @change="handleCateSlect"
           ></el-cascader>
-          <!-- <el-select v-model="form.parentCode" filterable placeholder="请选择" class="input-width" clearable>
+          <!-- <el-select v-model.trim="form.parentCode" filterable placeholder="请选择" class="input-width" clearable>
             <el-option
               v-for="item in demandOptions"
               :key="item.value"
@@ -371,13 +371,13 @@
         <el-form-item label="上报类型" prop="reportType">
           <el-input
             v-if="disabled"
-            v-model="form.reportTypeName"
+            v-model.trim="form.reportTypeName"
             :disabled="disabled"
             class="input-width-small"
           ></el-input>
           <el-select
             v-else
-            v-model="form.reportType"
+            v-model.trim="form.reportType"
             filterable
             class="input-width-small"
             placeholder="请选择"
@@ -395,7 +395,7 @@
         </el-form-item>
         <el-form-item label="上报人" prop="reportUserName">
           <el-input
-            v-model="form.reportUserName"
+            v-model.trim="form.reportUserName"
             :disabled="disabled"
             placeholder="请输入"
             class="input-width-small"
@@ -404,7 +404,7 @@
         </el-form-item>
         <el-form-item label="上报人联系电话" prop="reportUserMobile">
           <el-input
-            v-model="form.reportUserMobile"
+            v-model.trim="form.reportUserMobile"
             :disabled="disabled"
             placeholder="请输入"
             class="input-width-small"
@@ -414,7 +414,7 @@
         </el-form-item>
         <el-form-item label="上报时间" prop="reportTime">
           <el-date-picker
-            v-model="form.reportTime"
+            v-model.trim="form.reportTime"
             type="datetime"
             class="input-width-small"
             size="small"
@@ -428,13 +428,13 @@
         <el-form-item label="需求人" prop="demandUserId">
           <el-input
             v-if="disabled"
-            v-model="form.demandUserName"
+            v-model.trim="form.demandUserName"
             :disabled="disabled"
             class="input-width-small"
           ></el-input>
           <el-select
             v-else
-            v-model="form.demandUserId"
+            v-model.trim="form.demandUserId"
             class="input-width-small"
             filterable
             :disabled="disabled"
@@ -455,7 +455,7 @@
         </el-form-item>
         <el-form-item label="服务时间" prop="wantServiceTime">
           <el-date-picker
-            v-model="form.wantServiceTime"
+            v-model.trim="form.wantServiceTime"
             type="datetime"
             class="input-width-small"
             clearable
@@ -467,7 +467,7 @@
         </el-form-item>
         <el-form-item label="需求内容" prop="content">
           <el-input
-            v-model="form.content"
+            v-model.trim="form.content"
             :autosize="{ minRows: 2, maxRows: 10 }"
             :disabled="disabled"
             type="textarea"
@@ -487,14 +487,14 @@
         >
           <template v-if="disabled && addType !== 'appoint'">
             <el-input
-              v-model="form.serviceShowName"
+              v-model.trim="form.serviceShowName"
               :disabled="disabled"
               class="u-item-width-normal"
             ></el-input>
           </template>
           <template v-else>
             <el-select
-              v-model="form.serviceType"
+              v-model.trim="form.serviceType"
               class="u-item-width-normal"
               placeholder="请选择"
               clearable
@@ -511,7 +511,7 @@
             </el-select>
             -
             <el-select
-              v-model="form.serverId"
+              v-model.trim="form.serverId"
               class="u-item-width-normal"
               filterable
               placeholder="请选择"
@@ -543,7 +543,7 @@
         >
           <el-form-item label="实际服务时间" prop="serviceStartTime">
             <el-date-picker
-              v-model="finishServiceTime"
+              v-model.trim="finishServiceTime"
               class="u-item-width-normal"
               clearable
               :disabled="disabled && addType != 'finish'"
@@ -558,13 +558,13 @@
           </el-form-item>
           <el-form-item label="完成情况" prop="finishResult">
             <el-radio
-              v-model="form.finishResult"
+              v-model.trim="form.finishResult"
               label="resolved"
               :disabled="disabled && addType != 'finish'"
               >已解决</el-radio
             >
             <el-radio
-              v-model="form.finishResult"
+              v-model.trim="form.finishResult"
               label="unresolved"
               :disabled="disabled && addType != 'finish'"
               >未解决</el-radio
@@ -572,7 +572,7 @@
           </el-form-item>
           <el-form-item label="评价" prop="score" class="form-score">
             <el-rate
-              v-model="form.score"
+              v-model.trim="form.score"
               :allow-half="true"
               :disabled="disabled && addType != 'finish'"
             ></el-rate>
@@ -590,7 +590,7 @@
 
           <el-form-item label="备注" prop="finishDesc">
             <el-input
-              v-model="form.finishDesc"
+              v-model.trim="form.finishDesc"
               :autosize="{ minRows: 2, maxRows: 10 }"
               :disabled="disabled && addType != 'finish'"
               type="textarea"
@@ -603,7 +603,7 @@
         <template v-if="addType == 'finish' && form.reportType == 'self_help'">
           <el-form-item label="实际服务时间" prop="serviceStartTime">
             <el-date-picker
-              v-model="finishServiceTime"
+              v-model.trim="finishServiceTime"
               class="input-width-min"
               clearable
               :disabled="disabled && addType != 'finish'"
@@ -858,7 +858,7 @@ export default {
         demandUserId: "",
         demandUserName: "",
         demandUserMobile: "",
-        attachments: []
+        attachments:[]
       },
       rules: {
         gridId: [
diff --git a/src/views/modules/communityService/measure/info.vue b/src/views/modules/communityService/measure/info.vue
index 1f668df57..946d7424b 100644
--- a/src/views/modules/communityService/measure/info.vue
+++ b/src/views/modules/communityService/measure/info.vue
@@ -14,7 +14,7 @@
           :class="{ 'form-item': source === 'visiual' }"
           prop="addType"
         >
-          <el-radio-group v-model="addType">
+          <el-radio-group v-model.trim="addType">
             <el-radio label="look">查看</el-radio>
             <template v-if="form.reportType != 'self_help'">
               <el-radio label="edit" v-if="form.status === 'pending'"
@@ -64,14 +64,14 @@
           <div :class="{ 'visiual-form': source === 'visiual' }">
             <el-input
               v-if="disabled"
-              v-model="form.gridName"
+              v-model.trim="form.gridName"
               :disabled="disabled"
               class="item_width_1"
             ></el-input>
             <!-- <span >{{ form.gridName }}</span> -->
             <el-select
               v-else
-              v-model="form.gridId"
+              v-model.trim="form.gridId"
               filterable
               placeholder="请选择"
               class="item_width_1"
@@ -97,14 +97,14 @@
           <div :class="{ 'visiual-form': source === 'visiual' }">
             <el-input
               v-if="disabled"
-              v-model="form.categoryName"
+              v-model.trim="form.categoryName"
               :disabled="disabled"
               class="item_width_1"
               clearable
             ></el-input>
             <el-cascader
               v-else
-              v-model="form.categoryCodeArr"
+              v-model.trim="form.categoryCodeArr"
               :options="demandOptions"
               :disabled="disabled"
               clearable
@@ -121,13 +121,13 @@
           <div :class="{ 'visiual-form': source === 'visiual' }">
             <el-input
               v-if="disabled"
-              v-model="form.reportTypeName"
+              v-model.trim="form.reportTypeName"
               :disabled="disabled"
               class="item_width_1"
             ></el-input>
             <el-select
               v-else
-              v-model="form.reportType"
+              v-model.trim="form.reportType"
               filterable
               class="item_width_1"
               placeholder="请选择"
@@ -151,7 +151,7 @@
         >
           <div :class="{ 'visiual-form': source === 'visiual' }">
             <el-input
-              v-model="form.reportUserName"
+              v-model.trim="form.reportUserName"
               :disabled="disabled"
               placeholder="请输入"
               class="item_width_1"
@@ -166,7 +166,7 @@
         >
           <div :class="{ 'visiual-form': source === 'visiual' }">
             <el-input
-              v-model="form.reportUserMobile"
+              v-model.trim="form.reportUserMobile"
               :disabled="disabled"
               placeholder="请输入"
               class="item_width_1"
@@ -182,7 +182,7 @@
         >
           <div :class="{ 'visiual-form': source === 'visiual' }">
             <el-date-picker
-              v-model="form.reportTime"
+              v-model.trim="form.reportTime"
               type="datetime"
               class="item_width_1"
               clearable
@@ -201,13 +201,13 @@
           <div :class="{ 'visiual-form': source === 'visiual' }">
             <el-input
               v-if="disabled"
-              v-model="form.demandUserName"
+              v-model.trim="form.demandUserName"
               :disabled="disabled"
               class="item_width_1"
             ></el-input>
             <el-select
               v-else
-              v-model="form.demandUserId"
+              v-model.trim="form.demandUserId"
               class="item_width_1"
               filterable
               :disabled="disabled"
@@ -232,7 +232,7 @@
         >
           <div :class="{ 'visiual-form': source === 'visiual' }">
             <el-date-picker
-              v-model="form.wantServiceTime"
+              v-model.trim="form.wantServiceTime"
               type="datetime"
               clearable
               :disabled="disabled"
@@ -249,7 +249,7 @@
         >
           <div :class="{ 'visiual-form': source === 'visiual' }">
             <el-input
-              v-model="form.content"
+              v-model.trim="form.content"
               :autosize="{ minRows: 2, maxRows: 10 }"
               :disabled="disabled"
               type="textarea"
@@ -273,14 +273,14 @@
           <div :class="{ 'visiual-form': source === 'visiual' }">
             <template v-if="disabled && addType !== 'appoint'">
               <el-input
-                v-model="form.serviceShowName"
+                v-model.trim="form.serviceShowName"
                 :disabled="disabled"
                 class="item_width_1"
               ></el-input>
             </template>
             <template v-else>
               <el-select
-                v-model="form.serviceType"
+                v-model.trim="form.serviceType"
                 class="item_width_1-small"
                 placeholder="请选择"
                 clearable
@@ -297,7 +297,7 @@
               </el-select>
               -
               <el-select
-                v-model="form.serverId"
+                v-model.trim="form.serverId"
                 class="item_width_1-middle"
                 filterable
                 placeholder="请选择"
@@ -336,7 +336,7 @@
           >
             <div :class="{ 'visiual-form': source === 'visiual' }">
               <el-date-picker
-                v-model="finishServiceTime"
+                v-model.trim="finishServiceTime"
                 class="item_width_1-min"
                 clearable
                 :disabled="disabled && addType != 'finish'"
@@ -356,13 +356,13 @@
             prop="finishResult"
           >
             <el-radio
-              v-model="form.finishResult"
+              v-model.trim="form.finishResult"
               label="resolved"
               :disabled="disabled && addType != 'finish'"
               >已解决</el-radio
             >
             <el-radio
-              v-model="form.finishResult"
+              v-model.trim="form.finishResult"
               label="unresolved"
               :disabled="disabled && addType != 'finish'"
               >未解决</el-radio
@@ -375,7 +375,7 @@
             class="form-score"
           >
             <el-rate
-              v-model="form.score"
+              v-model.trim="form.score"
               :allow-half="true"
               :disabled="disabled && addType != 'finish'"
             ></el-rate>
@@ -387,7 +387,7 @@
           >
             <div :class="{ 'visiual-form': source === 'visiual' }">
               <el-input
-                v-model="form.finishDesc"
+                v-model.trim="form.finishDesc"
                 :autosize="{ minRows: 2, maxRows: 10 }"
                 :disabled="disabled && addType != 'finish'"
                 type="textarea"
@@ -406,7 +406,7 @@
           >
             <div :class="{ 'visiual-form-pickerrange': source === 'visiual' }">
               <el-date-picker
-                v-model="finishServiceTime"
+                v-model.trim="finishServiceTime"
                 class="item_width_1-min"
                 clearable
                 :disabled="disabled && addType != 'finish'"
diff --git a/src/views/modules/communityService/measure/points.vue b/src/views/modules/communityService/measure/points.vue
index 783c43959..b58d8b939 100644
--- a/src/views/modules/communityService/measure/points.vue
+++ b/src/views/modules/communityService/measure/points.vue
@@ -6,23 +6,23 @@
           <div>
             <!-- <el-form-item label="所属党组织" prop="partyOrgId">
               <el-cascader
-                v-model="partyOrgRange"
+                v-model.trim="partyOrgRange"
                 :options="optionsG"
                 :props="partyProps"
                 clearable
                 @change="handlePartyChange"></el-cascader>
             </el-form-item> -->
             <el-form-item label="姓名" prop="name">
-              <el-input v-model="searchForm.name" placeholder="请输入" class="input-width" clearable></el-input>
+              <el-input v-model.trim="searchForm.name" placeholder="请输入" class="input-width" clearable></el-input>
             </el-form-item>
             <el-form-item label="联系电话" prop="mobile">
-              <el-input v-model="searchForm.mobile" placeholder="请输入" class="input-width" clearable></el-input>
+              <el-input v-model.trim="searchForm.mobile" placeholder="请输入" class="input-width" clearable></el-input>
             </el-form-item>
             <el-form-item label="证件号" prop="idCard">
-              <el-input v-model="searchForm.idCard" placeholder="请输入" class="input-width" clearable></el-input>
+              <el-input v-model.trim="searchForm.idCard" placeholder="请输入" class="input-width" clearable></el-input>
             </el-form-item>
             <el-form-item label="审核状态" prop="status">
-              <el-select v-model="searchForm.status" filterable :disabled="disabled" placeholder="请选择" class="input-width" clearable>
+              <el-select v-model.trim="searchForm.status" filterable :disabled="disabled" placeholder="请选择" class="input-width" clearable>
                 <el-option
                   v-for="item in zwList"
                   :key="item.value"
@@ -35,7 +35,7 @@
           </div>
           <el-form-item label="申请时间"
                         prop="startTime">
-            <el-date-picker v-model="timeRange"
+            <el-date-picker v-model.trim="timeRange"
                             size="small"
                             type="daterange"
                             value-format="yyyy-MM-dd"
@@ -197,7 +197,7 @@
           <span>{{ detailInfo.pointValue }}</span>
         </el-form-item>
         <el-form-item label="审核状态:" prop="status" :label-width="'100px'">
-          <el-select v-model="form.status" placeholder="请选择" :disabled="disabled" class="input-width">
+          <el-select v-model.trim="form.status" placeholder="请选择" :disabled="disabled" class="input-width">
             <el-option
                 v-for="item in zwLists"
                 :key="item.value"
@@ -207,7 +207,7 @@
           </el-select>
         </el-form-item>
         <el-form-item label="备注:" prop="remark" :label-width="'100px'">
-          <el-input v-model="form.remark" type="textarea" :disabled="disabled" autocomplete="off" class="input-width"></el-input>
+          <el-input v-model.trim="form.remark" type="textarea" :disabled="disabled" autocomplete="off" class="input-width"></el-input>
         </el-form-item>
         
       </el-form>
@@ -230,7 +230,7 @@
         </div>
         <div>
           <!-- <el-form-item label="性别" prop="remark" :label-width="'100px'">
-            <el-input v-model="form.remark" autocomplete="off" class="input-width"></el-input>
+            <el-input v-model.trim="form.remark" autocomplete="off" class="input-width"></el-input>
           </el-form-item> -->
           <el-form-item label="联系电话:" :label-width="'100px'">
            <div class="input-width1">{{detailInfo.mobile}}</div>
diff --git a/src/views/modules/communityService/ninePlaces/inspect/inspect.vue b/src/views/modules/communityService/ninePlaces/inspect/inspect.vue
index 21a296abb..b175426d3 100644
--- a/src/views/modules/communityService/ninePlaces/inspect/inspect.vue
+++ b/src/views/modules/communityService/ninePlaces/inspect/inspect.vue
@@ -8,7 +8,7 @@
 
         <el-form-item label="场所名称"
                       prop="placeOrgName">
-          <el-input v-model="formData.placeOrgName"
+          <el-input v-model.trim="formData.placeOrgName"
                     size="small"
                     class="item_width_1"
                     clearable
@@ -20,7 +20,7 @@
         <el-form-item label="首次检查结果"
                       prop="firstResult">
           <el-select class="item_width_1"
-                     v-model="formData.firstResult"
+                     v-model.trim="formData.firstResult"
                      size="small"
                      placeholder="请选择"
                      clearable>
@@ -35,7 +35,7 @@
         <el-form-item label="场所区域"
                       prop="gridId">
           <el-select class="item_width_1"
-                     v-model="formData.gridId"
+                     v-model.trim="formData.gridId"
                      placeholder="全部"
                      clearable>
             <el-option v-for="item in gridList"
@@ -50,7 +50,7 @@
         <el-form-item label="场所类型"
                       prop="ninePlaceVal">
           <el-select class="item_width_1"
-                     v-model="formData.ninePlaceVal"
+                     v-model.trim="formData.ninePlaceVal"
                      size="small"
                      placeholder="请选择"
                      clearable>
@@ -66,7 +66,7 @@
         <el-form-item label="最新结果"
                       prop="finalResult">
           <el-select class="item_width_1"
-                     v-model="formData.finalResult"
+                     v-model.trim="formData.finalResult"
                      size="small"
                      placeholder="请选择"
                      clearable>
diff --git a/src/views/modules/communityService/ninePlaces/inspect/inspectForm.vue b/src/views/modules/communityService/ninePlaces/inspect/inspectForm.vue
index 7e0c8d460..1e5de613a 100644
--- a/src/views/modules/communityService/ninePlaces/inspect/inspectForm.vue
+++ b/src/views/modules/communityService/ninePlaces/inspect/inspectForm.vue
@@ -14,7 +14,7 @@
                       label-width="150px"
                       style="display: block">
           <el-select class="item_width_1"
-                     v-model="formData.gridId"
+                     v-model.trim="formData.gridId"
                      placeholder="全部"
                      clearable>
             <el-option v-for="item in gridList"
@@ -30,7 +30,7 @@
                       label-width="150px"
                       prop="ninePlaceVal">
           <el-select class="item_width_1"
-                     v-model="formData.ninePlaceVal"
+                     v-model.trim="formData.ninePlaceVal"
                      placeholder="请选择"
                      clearable>
             <el-option v-for="item in placeTypeList"
@@ -47,7 +47,7 @@
                       label-width="150px"
                       prop="placeOrgId">
           <el-select class="item_width_1"
-                     v-model="formData.placeOrgId"
+                     v-model.trim="formData.placeOrgId"
                      placeholder="请选择"
                      clearable>
             <el-option v-for="item in placesList"
@@ -62,7 +62,7 @@
                       label-width="150px"
                       prop="placePatrolTeamId">
           <el-select class="item_width_1"
-                     v-model="formData.placePatrolTeamId"
+                     v-model.trim="formData.placePatrolTeamId"
                      placeholder="请选择"
                      clearable>
             <el-option v-for="(item,index) in teamsList"
@@ -80,7 +80,7 @@
                       style="display: block">
           <el-checkbox-group class="item_width_1"
                              style="display:flex;flex-wrap:wrap"
-                             v-model="formData.inspectorArray">
+                             v-model.trim="formData.inspectorArray">
             <el-checkbox v-for="item in inspectorsList"
                          :key="item.id"
                          :label="item.id">{{item.name}}</el-checkbox>
@@ -92,7 +92,7 @@
                       style="display: block"
                       prop="firstTime"
                       label-width="150px">
-          <el-date-picker v-model="formData.firstTime"
+          <el-date-picker v-model.trim="formData.firstTime"
                           value-format="yyyy-MM-dd HH:mm:ss"
                           type="date"
                           placeholder="选择日期">
@@ -109,7 +109,7 @@
                     show-word-limit
                     :rows="3"
                     placeholder="请输入备注，不超过500字"
-                    v-model="formData.detailed"></el-input>
+                    v-model.trim="formData.detailed"></el-input>
         </el-form-item>
 
         <el-form-item label="首次检查结论"
@@ -117,7 +117,7 @@
                       label-width="150px"
                       style="display: block">
           <el-select class="item_width_1"
-                     v-model="formData.firstResult"
+                     v-model.trim="formData.firstResult"
                      placeholder="全部"
                      clearable>
             <el-option v-for="item in resultList"
@@ -132,7 +132,7 @@
                       style="display: block"
                       prop="reviewTime"
                       label-width="150px">
-          <el-date-picker v-model="formData.reviewTime"
+          <el-date-picker v-model.trim="formData.reviewTime"
                           value-format="yyyy-MM-dd HH:mm:ss"
                           type="date"
                           placeholder="选择日期">
diff --git a/src/views/modules/communityService/ninePlaces/inspect/inspectReview.vue b/src/views/modules/communityService/ninePlaces/inspect/inspectReview.vue
index 01013c285..33fcb1fbf 100644
--- a/src/views/modules/communityService/ninePlaces/inspect/inspectReview.vue
+++ b/src/views/modules/communityService/ninePlaces/inspect/inspectReview.vue
@@ -26,7 +26,7 @@
                          width="250">
           <template slot-scope="scope">
             <div v-if="scope.row.isEdit">
-              <el-date-picker v-model="scope.row.reviewTime"
+              <el-date-picker v-model.trim="scope.row.reviewTime"
                               value-format="yyyy-MM-dd"
                               type="date"
                               placeholder="选择日期">
@@ -45,7 +45,7 @@
           <template slot-scope="scope">
             <div v-if="scope.row.isEdit">
               <el-select class="item_width_1"
-                         v-model="scope.row.placePatrolTeamId"
+                         v-model.trim="scope.row.placePatrolTeamId"
                          placeholder="请选择"
                          clearable>
                 <el-option v-for="(item,index) in teamsList"
@@ -69,7 +69,7 @@
           <template slot-scope="scope">
             <div v-if="scope.row.isEdit">
               <el-checkbox-group style="display:flex;flex-wrap:wrap"
-                                 v-model="scope.row.inspectorArray">
+                                 v-model.trim="scope.row.inspectorArray">
                 <el-checkbox v-for="item in scope.row.inspectorsList"
                              :key="item.id"
                              :label="item.id">{{item.name}}</el-checkbox>
@@ -87,7 +87,7 @@
           <template slot-scope="scope">
             <div v-if="scope.row.isEdit">
               <el-select class="item_width_2"
-                         v-model="scope.row.reviewResult"
+                         v-model.trim="scope.row.reviewResult"
                          placeholder="全部"
                          clearable>
                 <el-option v-for="item in resultList"
diff --git a/src/views/modules/communityService/ninePlaces/places/places.vue b/src/views/modules/communityService/ninePlaces/places/places.vue
index 74a2e8698..1b50c144f 100644
--- a/src/views/modules/communityService/ninePlaces/places/places.vue
+++ b/src/views/modules/communityService/ninePlaces/places/places.vue
@@ -8,7 +8,7 @@
 
         <el-form-item label="场所名称"
                       prop="placeOrgName">
-          <el-input v-model="formData.placeOrgName"
+          <el-input v-model.trim="formData.placeOrgName"
                     size="small"
                     class="item_width_1"
                     clearable
@@ -19,7 +19,7 @@
 
         <el-form-item label="联系电话"
                       prop="mobile">
-          <el-input v-model="formData.mobile"
+          <el-input v-model.trim="formData.mobile"
                     size="small"
                     class="item_width_1"
                     clearable
@@ -31,7 +31,7 @@
         <el-form-item label="场所区域"
                       prop="gridId">
           <el-select class="item_width_1"
-                     v-model="formData.gridId"
+                     v-model.trim="formData.gridId"
                      size="small"
                      placeholder="全部"
                      clearable>
@@ -48,7 +48,7 @@
                       prop="scale">
           <el-select class="item_width_1"
                      size="small"
-                     v-model="formData.scale"
+                     v-model.trim="formData.scale"
                      placeholder="请选择"
                      clearable>
             <el-option v-for="item in scaleList"
@@ -63,7 +63,7 @@
                       prop="ninePlaceVal">
           <el-select class="item_width_1"
                      size="small"
-                     v-model="formData.ninePlaceVal"
+                     v-model.trim="formData.ninePlaceVal"
                      placeholder="请选择"
                      clearable>
             <el-option v-for="item in placeTypeList"
diff --git a/src/views/modules/communityService/ninePlaces/places/placesForm.vue b/src/views/modules/communityService/ninePlaces/places/placesForm.vue
index 67239c255..ecfa00aac 100644
--- a/src/views/modules/communityService/ninePlaces/places/placesForm.vue
+++ b/src/views/modules/communityService/ninePlaces/places/placesForm.vue
@@ -13,7 +13,7 @@
                       label-width="150px"
                       prop="ninePlaceVal">
           <el-select class="item_width_1"
-                     v-model="formData.ninePlaceVal"
+                     v-model.trim="formData.ninePlaceVal"
                      placeholder="请选择"
                      clearable>
             <el-option v-for="item in placeTypeList"
@@ -30,7 +30,7 @@
                       label-width="150px"
                       style="display: block">
           <el-select class="item_width_1"
-                     v-model="formData.gridId"
+                     v-model.trim="formData.gridId"
                      placeholder="全部"
                      clearable>
             <el-option v-for="item in gridList"
@@ -44,7 +44,7 @@
         <el-form-item label="场所名称"
                       label-width="150px"
                       prop="placeOrgName">
-          <el-input v-model="formData.placeOrgName"
+          <el-input v-model.trim="formData.placeOrgName"
                     class="item_width_1"
                     clearable
                     placeholder="请输入九小场所名称">
@@ -54,7 +54,7 @@
         <el-form-item label="场所地址"
                       label-width="150px"
                       prop="address">
-          <el-input v-model="formData.address"
+          <el-input v-model.trim="formData.address"
                     class="item_width_1"
                     clearable
                     placeholder="请输入场所地址">
@@ -66,7 +66,7 @@
                       label-width="150px"
                       prop="scale">
           <el-select class="item_width_1"
-                     v-model="formData.scale"
+                     v-model.trim="formData.scale"
                      placeholder="请选择"
                      clearable>
             <el-option v-for="item in scaleList"
@@ -80,7 +80,7 @@
         <el-form-item label="负责人"
                       label-width="150px"
                       prop="personInCharge">
-          <el-input v-model="formData.personInCharge"
+          <el-input v-model.trim="formData.personInCharge"
                     class="item_width_1"
                     clearable
                     placeholder="请输入负责人姓名">
@@ -90,7 +90,7 @@
         <el-form-item label="联系电话"
                       label-width="150px"
                       prop="mobile">
-          <el-input v-model="formData.mobile"
+          <el-input v-model.trim="formData.mobile"
                     class="item_width_1"
                     type='number'
                     clearable
diff --git a/src/views/modules/communityService/ninePlaces/team/team.vue b/src/views/modules/communityService/ninePlaces/team/team.vue
index 5b8f13635..ffeecca59 100644
--- a/src/views/modules/communityService/ninePlaces/team/team.vue
+++ b/src/views/modules/communityService/ninePlaces/team/team.vue
@@ -9,7 +9,7 @@
 
           <el-form-item label="负责人"
                         prop="personInCharge">
-            <el-input v-model="formData.personInCharge"
+            <el-input v-model.trim="formData.personInCharge"
                       size="small"
                       class="item_width_1"
                       clearable
@@ -20,7 +20,7 @@
 
           <el-form-item label="联系电话"
                         prop="mobile">
-            <el-input v-model="formData.mobile"
+            <el-input v-model.trim="formData.mobile"
                       size="small"
                       class="item_width_1"
                       clearable
@@ -32,7 +32,7 @@
           <el-form-item label="负责区域"
                         prop="gridId">
             <el-select class="item_width_1"
-                       v-model="formData.gridId"
+                       v-model.trim="formData.gridId"
                        size="small"
                        placeholder="全部"
                        clearable>
@@ -49,7 +49,7 @@
                         prop="ninePlaceVal">
             <el-select class="item_width_1"
                        size="small"
-                       v-model="formData.ninePlaceVal"
+                       v-model.trim="formData.ninePlaceVal"
                        placeholder="请选择"
                        clearable>
               <el-option v-for="item in placeTypeList"
diff --git a/src/views/modules/communityService/ninePlaces/team/teamForm.vue b/src/views/modules/communityService/ninePlaces/team/teamForm.vue
index b631c05ad..59b5288b8 100644
--- a/src/views/modules/communityService/ninePlaces/team/teamForm.vue
+++ b/src/views/modules/communityService/ninePlaces/team/teamForm.vue
@@ -12,7 +12,7 @@
         <el-form-item label="分队名称"
                       label-width="150px"
                       prop="teamName">
-          <el-input v-model="formData.teamName"
+          <el-input v-model.trim="formData.teamName"
                     class="item_width_1"
                     clearable
                     placeholder="请输入分队名称">
@@ -24,7 +24,7 @@
                       label-width="150px"
                       style="display: block">
           <el-select class="item_width_1"
-                     v-model="formData.gridIdArray"
+                     v-model.trim="formData.gridIdArray"
                      placeholder="全部"
                      multiple
                      clearable>
@@ -42,7 +42,7 @@
                       style="display: block">
           <el-checkbox-group class="item_width_1"
                              style="display:flex;flex-wrap:wrap"
-                             v-model="formData.ninePlaceArray">
+                             v-model.trim="formData.ninePlaceArray">
             <el-checkbox v-for="item in placeTypeList"
                          :key="item.value"
                          :label="item.value">{{item.label}}</el-checkbox>
@@ -61,14 +61,14 @@
                     show-word-limit
                     :rows="3"
                     placeholder="请输入备注，不超过500字"
-                    v-model="formData.plan"></el-input>
+                    v-model.trim="formData.plan"></el-input>
         </el-form-item>
 
         <el-form-item label="创建时间"
                       style="display: block"
                       prop="time"
                       label-width="150px">
-          <el-date-picker v-model="formData.time"
+          <el-date-picker v-model.trim="formData.time"
                           value-format="yyyy-MM-dd HH:mm:ss"
                           type="date"
                           placeholder="选择日期">
@@ -78,7 +78,7 @@
         <el-form-item label="负责人"
                       label-width="150px"
                       prop="personInCharge">
-          <el-input v-model="formData.personInCharge"
+          <el-input v-model.trim="formData.personInCharge"
                     class="item_width_1"
                     clearable
                     placeholder="请输入负责人姓名">
@@ -88,7 +88,7 @@
         <el-form-item label="联系电话"
                       label-width="150px"
                       prop="mobile">
-          <el-input v-model="formData.mobile"
+          <el-input v-model.trim="formData.mobile"
                     class="item_width_1"
                     type='number'
                     clearable
@@ -111,7 +111,7 @@
                :class="[{'margin10':formType !== 'detail'}]">
             <span class="div_person_list_title">姓名</span>
             <el-input v-if="item.isSet"
-                      v-model="item.name"
+                      v-model.trim="item.name"
                       class="item_width_3"
                       clearable
                       placeholder="请输入姓名">
@@ -121,7 +121,7 @@
 
             <span class="div_person_list_title2">联系电话</span>
             <el-input v-if="item.isSet"
-                      v-model="item.mobile"
+                      v-model.trim="item.mobile"
                       class="item_width_4"
                       clearable
                       placeholder="联系电话">
diff --git a/src/views/modules/communityService/policy/addPolicy.vue b/src/views/modules/communityService/policy/addPolicy.vue
index 9b2f0d4cd..530b3a537 100644
--- a/src/views/modules/communityService/policy/addPolicy.vue
+++ b/src/views/modules/communityService/policy/addPolicy.vue
@@ -13,7 +13,7 @@
         <el-form-item label="政策类型" prop="categoryCode" label-width="150px">
           <el-cascader
           ref="categoryCode"
-            v-model="formData.categoryCode"
+            v-model.trim="formData.categoryCode"
             :options="demandOptions"
             :props="{label: 'categoryName',value: 'categoryCode',children: 'childCateList'}"
             clearable
@@ -31,7 +31,7 @@
           <el-input
             class="item_width_1"
             placeholder="请输入政策标题"
-            v-model="formData.title"
+            v-model.trim="formData.title"
           >
           </el-input>
         </el-form-item>
@@ -43,7 +43,7 @@
           prop="startDate"
         >
           <el-date-picker
-            v-model="formData.startDate"
+            v-model.trim="formData.startDate"
             class="item_width_2"
             type="datetime"
             value-format="yyyy-MM-dd HH:mm:ss"
@@ -53,7 +53,7 @@
           </el-date-picker>
           <span class="u-data-tag">至</span>
           <el-date-picker
-            v-model="formData.endDate"
+            v-model.trim="formData.endDate"
             class="item_width_2 u-data-tag"
             type="datetime"
             value-format="yyyy-MM-dd HH:mm:ss"
@@ -71,7 +71,7 @@
         >
           <el-select
             class="item_width_2"
-            v-model="formData.policyLevel"
+            v-model.trim="formData.policyLevel"
             placeholder="全部"
             clearable
           >
@@ -98,7 +98,7 @@
             show-word-limit
             :rows="10"
             placeholder="请输入政策内容"
-            v-model="formData.content"
+            v-model.trim="formData.content"
           ></el-input>
         </el-form-item>
 
@@ -154,7 +154,7 @@
           <el-switch
             :active-value="1"
             :inactive-value="0"
-            v-model="formData.assignFlag"
+            v-model.trim="formData.assignFlag"
           >
           </el-switch>
         </el-form-item>
@@ -175,7 +175,7 @@
           prop="serverOrgId"
         >
           <el-select
-            v-model="newFormData.serverOrgType"
+            v-model.trim="newFormData.serverOrgType"
             class="input-width-small"
             placeholder="请选择"
             clearable
@@ -191,7 +191,7 @@
           </el-select>
           -
           <el-select
-            v-model="newFormData.serverOrgId"
+            v-model.trim="newFormData.serverOrgId"
             class="input-width-middle"
             filterable
             placeholder="请选择"
@@ -200,7 +200,7 @@
             <el-option
               v-for="item in serviceOptiondList"
               :key="item.id"
-              :label="item.name"
+              :label="item.label"
               :value="item.id"
             >
             </el-option>
@@ -213,7 +213,7 @@
           label-width="150px"
           style="display: block"
         >
-          <el-checkbox-group v-model="newFormData.noticeApproches">
+          <el-checkbox-group v-model.trim="newFormData.noticeApproches">
             <el-checkbox label="sms" value="sms">短信通知</el-checkbox>
             <el-checkbox label="wx" value="wx">微信公众号消息通知</el-checkbox>
           </el-checkbox-group>
@@ -229,7 +229,7 @@
           <el-cascader
             class="item_width_1"
             ref="myCascader"
-            v-model="newFormData.serviceScopeList"
+            v-model.trim="newFormData.serviceScopeList"
             :key="iscascaderShow"
             :options="casOptions"
             :props="optionProps"
@@ -245,7 +245,7 @@
         >
           <!-- :picker-options="startPickerOptions" -->
           <el-date-picker
-            v-model="newFormData.serviceTimeStart"
+            v-model.trim="newFormData.serviceTimeStart"
             class="item_width_2"
             style="width: 220px"
             type="datetime"
@@ -257,7 +257,7 @@
           <!-- :picker-options="endPickerOptions" -->
           <span class="u-data-tag">至</span>
           <el-date-picker
-            v-model="newFormData.serviceTimeEnd"
+            v-model.trim="newFormData.serviceTimeEnd"
             class="item_width_2 u-data-tag"
             style="width: 220px"
             type="datetime"
@@ -438,7 +438,6 @@ export default {
     await this.getServiceTypeDictOptions();
     await this.getDictOptions();
     await this.loadScopeTree();
-    await this.loadDemandoption();
     await this.getDemandOptions();
     if (this.formType === "add") {
       this.$refs.ref_form.resetFields();
@@ -645,26 +644,6 @@ export default {
      
     },
 
-    // 获取服务范围树
-    loadDemandoption() {
-      const url = "/governance/icresidemanddict/demandoption";
-      // const url = 'http://yapi.elinkservice.cn/mock/245/gov/org/isServiceProject/service/serviceScopeTree'
-      let params = {};
-      window.app.ajax.post(
-        url,
-        params,
-        (data, rspMsg) => {
-          this.demandOptions = this.getFlagData(
-            this.getTreeData(data),
-            "usableFlag"
-          );
-        },
-        (rspMsg, data) => {
-          this.$message.error(rspMsg);
-        }
-      );
-    },
-
     async handleAdd() {
       // var oDate1 = new Date(this.formData.startDate);
       // var oDate2 = new Date(this.formData.endDate);
diff --git a/src/views/modules/communityService/policy/detailForm.vue b/src/views/modules/communityService/policy/detailForm.vue
index a5f1fe42d..e0506b179 100644
--- a/src/views/modules/communityService/policy/detailForm.vue
+++ b/src/views/modules/communityService/policy/detailForm.vue
@@ -14,7 +14,7 @@
                       prop="serviceCategoryKey">
           <span>{{formData.serviceCategoryName}}</span>
 
-          <!-- <el-select v-model="formData.serviceCategoryKey"
+          <!-- <el-select v-model.trim="formData.serviceCategoryKey"
                      placeholder="请选择"
                      clearable
                      class="item_width_1">
@@ -33,7 +33,7 @@
                       style="display: block">
           <span>{{formData.serviceProjectName}}</span>
           <!-- <el-select class="item_width_1"
-                     v-model="formData.serviceProjectId"
+                     v-model.trim="formData.serviceProjectId"
                      placeholder="请选择"
                      filterable
                      clearable>
@@ -52,7 +52,7 @@
                       style="display: block">
           <span>{{formData.serviceOrgName}}</span>
           <!-- <el-select class="item_width_1"
-                     v-model="formData.serviceOrgId"
+                     v-model.trim="formData.serviceOrgId"
                      placeholder="请选择"
                      filterable
                      clearable>
@@ -75,7 +75,7 @@
           </div>
           <!-- <el-cascader class="item_width_1"
                        ref="myCascader"
-                       v-model="scopeIdArray"
+                       v-model.trim="scopeIdArray"
                        :key="iscascaderShow"
                        :options="casOptions"
                        :props="optionProps"
@@ -89,7 +89,7 @@
                       style="display: block">
           <el-input class="item_width_1"
                     placeholder="请输入联系人姓名"
-                    v-model="formData.principalName">
+                    v-model.trim="formData.principalName">
           </el-input>
         </el-form-item>
         <el-form-item label="联系方式"
@@ -98,14 +98,14 @@
                       style="display: block">
           <el-input class="item_width_1"
                     placeholder="请输入联系人电话"
-                    v-model="formData.principalContact">
+                    v-model.trim="formData.principalContact">
           </el-input>
         </el-form-item>
 
         <el-form-item label="服务时间"
                       label-width="150px"
                       prop="serviceTimeStart">
-          <el-date-picker v-model="formData.serviceTimeStart"
+          <el-date-picker v-model.trim="formData.serviceTimeStart"
                           :picker-options="startPickerOptions"
                           class="item_width_2"
                           type="date"
@@ -114,7 +114,7 @@
                           placeholder="开始时间">
           </el-date-picker>
           <span class="u-data-tag">至</span>
-          <el-date-picker v-model="formData.serviceTimeEnd"
+          <el-date-picker v-model.trim="formData.serviceTimeEnd"
                           :picker-options="endPickerOptions"
                           class="item_width_2 u-data-tag"
                           type="date"
@@ -134,7 +134,7 @@
                     show-word-limit
                     :rows="3"
                     placeholder="请输入备注，不超过500字"
-                    v-model="formData.remark"></el-input>
+                    v-model.trim="formData.remark"></el-input>
         </el-form-item>
 
       </el-form>
@@ -158,7 +158,7 @@
                       show-word-limit
                       :rows="3"
                       placeholder="请输入服务目标，不超过1000字"
-                      v-model="feedbackFormData.serviceGoal"></el-input>
+                      v-model.trim="feedbackFormData.serviceGoal"></el-input>
           </el-form-item>
 
           <el-form-item label="服务效果"
@@ -171,7 +171,7 @@
                       show-word-limit
                       :rows="3"
                       placeholder="请输入服务效果，不超过1000字"
-                      v-model="feedbackFormData.serviceEffect"></el-input>
+                      v-model.trim="feedbackFormData.serviceEffect"></el-input>
           </el-form-item>
 
           <el-form-item label="服务人数"
@@ -179,7 +179,7 @@
                         prop="servicePeopleNumber"
                         label-width="150px">
             <el-input-number class="item_width_1"
-                             v-model="feedbackFormData.servicePeopleNumber"
+                             v-model.trim="feedbackFormData.servicePeopleNumber"
                              :min="0"
                              :max="9999"
                              label="服务人数"></el-input-number>
@@ -190,7 +190,7 @@
                         prop="serviceStatus">
             <span>已完成</span>
             <!-- <el-select class="item_width_1"
-                       v-model="feedbackFormData.serviceStatus"
+                       v-model.trim="feedbackFormData.serviceStatus"
                        placeholder="全部"
                        clearable>
               <el-option v-for="item in statusArray"
@@ -205,7 +205,7 @@
                         label-width="150px"
                         prop="satisfaction">
             <el-select class="item_width_1"
-                       v-model="feedbackFormData.satisfaction"
+                       v-model.trim="feedbackFormData.satisfaction"
                        placeholder="全部"
                        clearable>
               <el-option v-for="item in satisfyArray"
@@ -221,7 +221,7 @@
                         label-width="150px"
                         style="display: block">
             <el-input class="item_width_1"
-                      v-model="feedbackFormData.address"></el-input>
+                      v-model.trim="feedbackFormData.address"></el-input>
           </el-form-item>
           <!-- <el-form-item label="地图位置"
                         label-width="150px"
@@ -236,7 +236,7 @@
                   <el-input maxlength="50"
                             size="mini"
                             placeholder="请输入关键字"
-                            v-model="keyWords">
+                            v-model.trim="keyWords">
                   </el-input>
                   <el-button style="margin-left: 10px"
                              type="primary"
diff --git a/src/views/modules/communityService/policy/personList.vue b/src/views/modules/communityService/policy/personList.vue
index 547252981..7a0771763 100644
--- a/src/views/modules/communityService/policy/personList.vue
+++ b/src/views/modules/communityService/policy/personList.vue
@@ -18,7 +18,7 @@
         </el-form-item>
         <el-form-item label="人员姓名" prop="title">
           <el-input
-            v-model="searchFormData.name"
+            v-model.trim="searchFormData.name"
             class="u-item-width-normal"
             size="small"
             clearable
@@ -29,7 +29,7 @@
 
         <el-form-item label="手机号" prop="title">
           <el-input
-            v-model="searchFormData.mobile"
+            v-model.trim="searchFormData.mobile"
             class="u-item-width-normal"
             size="small"
             clearable
@@ -40,7 +40,7 @@
 
         <el-form-item label="身份证号" prop="title">
           <el-input
-            v-model="searchFormData.idCard"
+            v-model.trim="searchFormData.idCard"
             class="u-item-width-normal"
             size="small"
             clearable
@@ -51,7 +51,7 @@
 
         <el-form-item label="享受服务次数" prop="title">
           <el-input
-            v-model="searchFormData.serveTimes"
+            v-model.trim="searchFormData.serveTimes"
             class="u-item-width-normal"
             size="small"
             clearable
@@ -62,7 +62,7 @@
 
         <el-form-item label="家庭住址" prop="title">
           <el-select
-            v-model="searchFormData.villageId"
+            v-model.trim="searchFormData.villageId"
             placeholder="请选择小区"
             @change="handleQuarterSelectorsChange"
             clearable
@@ -76,7 +76,7 @@
             </el-option>
           </el-select>
           <el-select
-            v-model="searchFormData.buildId"
+            v-model.trim="searchFormData.buildId"
             placeholder="请选择楼栋"
             @change="handleBuildSelectorsChange"
             clearable
@@ -90,7 +90,7 @@
             </el-option>
           </el-select>
           <el-select
-            v-model="searchFormData.unitId"
+            v-model.trim="searchFormData.unitId"
             placeholder="请选择单元"
             @change="handleUnitSelectorsChange"
             clearable
@@ -104,7 +104,7 @@
             </el-option>
           </el-select>
           <el-select
-            v-model="searchFormData.homeId"
+            v-model.trim="searchFormData.homeId"
             placeholder="请选择房屋"
             @change="handleUnitSelectorsChange"
             clearable
diff --git a/src/views/modules/communityService/policy/personListItem.vue b/src/views/modules/communityService/policy/personListItem.vue
index df89e5d37..f59e278bf 100644
--- a/src/views/modules/communityService/policy/personListItem.vue
+++ b/src/views/modules/communityService/policy/personListItem.vue
@@ -13,7 +13,7 @@
                          ref="myCascader"
                          size="small"
                          class="u-item-width-normal"
-                         v-model="agencyIdArray"
+                         v-model.trim="agencyIdArray"
                          :options="orgOptions"
                          :props="orgOptionProps"
                          :show-all-levels="false"
@@ -86,7 +86,7 @@
 
           <el-form-item label="姓名"
                         prop="name">
-            <el-input v-model="formData.name"
+            <el-input v-model.trim="formData.name"
                       size="small"
                       class="u-item-width-normal"
                       clearable
@@ -96,7 +96,7 @@
           </el-form-item>
           <el-form-item label="联系电话"
                         prop="mobile">
-            <el-input v-model="formData.mobile"
+            <el-input v-model.trim="formData.mobile"
                       size="small"
                       class="u-item-width-normal"
                       clearable
@@ -107,7 +107,7 @@
 
           <el-form-item label="证件号"
                         prop="mobile">
-            <el-input v-model="formData.idCard"
+            <el-input v-model.trim="formData.idCard"
                       size="small"
                       class="u-item-width-normal"
                       clearable
diff --git a/src/views/modules/communityService/policy/policyList.vue b/src/views/modules/communityService/policy/policyList.vue
index ebecd1d11..ab4c614a4 100644
--- a/src/views/modules/communityService/policy/policyList.vue
+++ b/src/views/modules/communityService/policy/policyList.vue
@@ -9,7 +9,7 @@
       >
         <el-form-item label="政策标题" prop="title">
           <el-input
-            v-model="formData.title"
+            v-model.trim="formData.title"
             class="u-item-width-normal"
             size="small"
             clearable
@@ -22,7 +22,7 @@
           <el-select
             class="u-item-width-normal"
             size="small"
-            v-model="formData.policyLevel"
+            v-model.trim="formData.policyLevel"
             placeholder="全部"
             clearable
           >
@@ -37,7 +37,7 @@
         </el-form-item>
         <el-form-item label="人员标签" prop="resiSearchTagName">
           <el-input
-            v-model="formData.resiSearchTagName"
+            v-model.trim="formData.resiSearchTagName"
             placeholder="请输入"
             size="small"
             class="u-item-width-normal"
@@ -47,7 +47,7 @@
         <el-form-item label="是否过期" prop="expiredFlag">
           <el-select
             class="u-item-width-normal"
-            v-model="formData.expiredFlag"
+            v-model.trim="formData.expiredFlag"
             placeholder="请选择"
             size="small"
             clearable
@@ -63,7 +63,7 @@
         </el-form-item>
         <el-form-item label="发布日期" prop="createdTimeStart">
           <el-date-picker
-            v-model="formData.createdTimeStart"
+            v-model.trim="formData.createdTimeStart"
             class="u-item-width-daterange"
             size="small"
             type="datetime"
@@ -74,7 +74,7 @@
           </el-date-picker>
           <span class="u-data-tag">至</span>
           <el-date-picker
-            v-model="formData.createdTimeEnd"
+            v-model.trim="formData.createdTimeEnd"
             class="u-item-width-daterange u-data-tag"
             size="small"
             type="datetime"
diff --git a/src/views/modules/communityService/policy/rule.vue b/src/views/modules/communityService/policy/rule.vue
index 902653cb9..f32add4cb 100644
--- a/src/views/modules/communityService/policy/rule.vue
+++ b/src/views/modules/communityService/policy/rule.vue
@@ -1,13 +1,13 @@
 <template>
   <div>
     <div>
-      <el-checkbox v-model="personChecked"></el-checkbox>
+      <el-checkbox v-model.trim="personChecked"></el-checkbox>
       <span @click="clickTab('person')"
             :class="['tab-title',{'tab-title-sel':personSel}]">人员信息</span>
-      <el-checkbox v-model="houseChecked"></el-checkbox>
+      <el-checkbox v-model.trim="houseChecked"></el-checkbox>
       <span @click="clickTab('house')"
             :class="['tab-title',{'tab-title-sel':houseSel}]">房屋信息</span>
-      <el-checkbox v-model="staticChecked"></el-checkbox>
+      <el-checkbox v-model.trim="staticChecked"></el-checkbox>
       <span @click="clickTab('static')"
             :class="['tab-title',{'tab-title-sel':staticSel}]">统计信息</span>
 
@@ -30,7 +30,7 @@
            :key="personIndex"
            class="row-item">
         <el-select class="item_width_1"
-                   v-model="personItem.itemGroupId"
+                   v-model.trim="personItem.itemGroupId"
                    size="mini"
                    placeholder="请选择">
           <el-option v-for="item in groupList"
@@ -41,7 +41,7 @@
           </el-option>
         </el-select>
         <el-select class="item_width_1"
-                   v-model="personItem.itemId"
+                   v-model.trim="personItem.itemId"
                    size="mini"
                    placeholder="请选择">
           <el-option v-for="item in personItem.itemList"
@@ -52,7 +52,7 @@
           </el-option>
         </el-select>
         <el-select class="item_width_1"
-                   v-model="personItem.queryType"
+                   v-model.trim="personItem.queryType"
                    size="mini"
                    placeholder="请选择">
           <el-option v-for="item in queryList"
@@ -66,7 +66,7 @@
 
           <el-select v-if="personItem.colType==='select'||personItem.colType==='radio'||personItem.colType==='checkbox'"
                      class="item_width_2"
-                     v-model="personItem.colVal"
+                     v-model.trim="personItem.colVal"
                      size="mini"
                      placeholder="请选择">
             <el-option v-for="item in personItem.colOption"
@@ -78,13 +78,13 @@
           </el-select>
           <el-input-number v-else-if="personItem.colType==='inputNum'"
                            class="item_width_2"
-                           v-model="personItem.colVal"
+                           v-model.trim="personItem.colVal"
                            :min="0"
                            size="mini"
                            label="请输入"></el-input-number>
 
           <el-date-picker v-else-if="personItem.colType==='datepicker'||personItem.colType==='date'"
-                          v-model="personItem.colVal"
+                          v-model.trim="personItem.colVal"
                           class="item_width_2"
                           type="datetime"
                           value-format="yyyy-MM-dd HH:mm:ss"
@@ -95,14 +95,14 @@
                     class="item_width_2"
                     size="mini"
                     placeholder="请输入"
-                    v-model="personItem.colVal">
+                    v-model.trim="personItem.colVal">
           </el-input>
 
         </div>
 
         <el-select v-if="personIndex<(resiRuleList.length-1)"
                    class="item_width_1"
-                   v-model="personItem.nextLogicalRel"
+                   v-model.trim="personItem.nextLogicalRel"
                    size="mini"
                    placeholder="请选择">
           <el-option v-for="item in logicalList"
@@ -135,10 +135,10 @@
                   size="mini"
                   placeholder="请输入"
                   :disabled="true"
-                  v-model="houseTitleName">
+                  v-model.trim="houseTitleName">
         </el-input>
         <el-select class="item_width_1"
-                   v-model="houseItem.colKey"
+                   v-model.trim="houseItem.colKey"
                    size="mini"
                    placeholder="请选择">
           <el-option v-for="item in houseItemList"
@@ -149,7 +149,7 @@
           </el-option>
         </el-select>
         <el-select class="item_width_1"
-                   v-model="houseItem.queryType"
+                   v-model.trim="houseItem.queryType"
                    size="mini"
                    placeholder="请选择">
           <el-option v-for="item in queryList"
@@ -163,7 +163,7 @@
 
           <el-select v-if="houseItem.colType==='select'||houseItem.colType==='radio'||houseItem.colType==='checkbox'"
                      class="item_width_2"
-                     v-model="houseItem.colVal"
+                     v-model.trim="houseItem.colVal"
                      size="mini"
                      placeholder="请选择">
             <el-option v-for="item in houseItem.colOption"
@@ -175,12 +175,12 @@
           </el-select>
           <el-input-number v-else-if="houseItem.colType==='inputNum'"
                            class="item_width_2"
-                           v-model="houseItem.colVal"
+                           v-model.trim="houseItem.colVal"
                            :min="0"
                            size="mini"
                            label="请输入"></el-input-number>
           <el-date-picker v-else-if="houseItem.colType==='datepicker'||houseItem.colType==='date'"
-                          v-model="houseItem.colVal"
+                          v-model.trim="houseItem.colVal"
                           class="item_width_2"
                           type="datetime"
                           size="mini"
@@ -192,13 +192,13 @@
                     class="item_width_2"
                     size="mini"
                     placeholder="请输入"
-                    v-model="houseItem.colVal">
+                    v-model.trim="houseItem.colVal">
           </el-input>
         </div>
 
         <el-select v-if="houseIndex<(houseRuleList.length-1)"
                    class="item_width_1"
-                   v-model="houseItem.nextLogicalRel"
+                   v-model.trim="houseItem.nextLogicalRel"
                    size="mini"
                    placeholder="请选择">
           <el-option v-for="item in logicalList"
@@ -231,10 +231,10 @@
                   size="mini"
                   placeholder="请输入"
                   :disabled="true"
-                  v-model="statTitleName">
+                  v-model.trim="statTitleName">
         </el-input>
         <el-select class="item_width_1"
-                   v-model="staticItem.colKey"
+                   v-model.trim="staticItem.colKey"
                    size="mini"
                    placeholder="请选择">
           <el-option v-for="item in staticItemList"
@@ -245,7 +245,7 @@
           </el-option>
         </el-select>
         <el-select class="item_width_1"
-                   v-model="staticItem.queryType"
+                   v-model.trim="staticItem.queryType"
                    size="mini"
                    placeholder="请选择">
           <el-option v-for="item in queryList"
@@ -259,7 +259,7 @@
         <div v-if="staticItem.queryType!=='is_null'&&staticItem.queryType!=='is_not_null'">
           <el-select v-if="staticItem.colType==='select'||staticItem.colType==='radio'||staticItem.colType==='checkbox'"
                      class="item_width_2"
-                     v-model="staticItem.colVal"
+                     v-model.trim="staticItem.colVal"
                      size="mini"
                      placeholder="请选择">
             <el-option v-for="item in staticItem.colOption"
@@ -271,12 +271,12 @@
           </el-select>
           <el-input-number v-else-if="staticItem.colType==='inputNum'"
                            class="item_width_2"
-                           v-model="staticItem.colVal"
+                           v-model.trim="staticItem.colVal"
                            :min="0"
                            size="mini"
                            label="请输入"></el-input-number>
           <el-date-picker v-else-if="staticItem.colType==='datepicker'||staticItem.colType==='date'"
-                          v-model="staticItem.colVal"
+                          v-model.trim="staticItem.colVal"
                           class="item_width_2"
                           type="datetime"
                           value-format="yyyy-MM-dd HH:mm:ss"
@@ -287,13 +287,13 @@
                     class="item_width_2"
                     size="mini"
                     placeholder="请输入"
-                    v-model="staticItem.colVal">
+                    v-model.trim="staticItem.colVal">
           </el-input>
         </div>
 
         <el-select v-if="staticIndex<(statRuleList.length-1)"
                    class="item_width_1"
-                   v-model="staticItem.nextLogicalRel"
+                   v-model.trim="staticItem.nextLogicalRel"
                    size="mini"
                    placeholder="请选择">
           <el-option v-for="item in logicalList"
diff --git a/src/views/modules/communityService/shzz/cpts/edit.vue b/src/views/modules/communityService/shzz/cpts/edit.vue
index 3ff773511..afea81d69 100644
--- a/src/views/modules/communityService/shzz/cpts/edit.vue
+++ b/src/views/modules/communityService/shzz/cpts/edit.vue
@@ -50,7 +50,7 @@
                     maxlength="50"
                     show-word-limit
                     placeholder="请输入组织名称	"
-                    v-model="dataForm.societyName">
+                    v-model.trim="dataForm.societyName">
           </el-input>
         </el-form-item>
 
@@ -64,7 +64,7 @@
                     show-word-limit
                     :rows="3"
                     placeholder="请输入服务内容，不超过1000字"
-                    v-model="dataForm.serviceMatters"></el-input>
+                    v-model.trim="dataForm.serviceMatters"></el-input>
         </el-form-item>
 
         <!--        <el-form-item
@@ -78,7 +78,7 @@
               maxlength="50"
               show-word-limit
               placeholder="请输入负责人姓名	"
-              v-model="dataForm.personInCharge"
+              v-model.trim="dataForm.personInCharge"
           >
           </el-input>
         </el-form-item>-->
@@ -91,7 +91,7 @@
                     maxlength="50"
                     show-word-limit
                     placeholder="请输入服务电话	"
-                    v-model="dataForm.mobile">
+                    v-model.trim="dataForm.mobile">
           </el-input>
         </el-form-item>
 
@@ -103,10 +103,10 @@
                     maxlength="50"
                     show-word-limit
                     placeholder="请输入服务时间	"
-                    v-model="dataForm.serviceTimeStr">
+                    v-model.trim="dataForm.serviceTimeStr">
           </el-input>
           <!--          <el-date-picker
-              v-model="dataForm.serviceTime"
+              v-model.trim="dataForm.serviceTime"
               type="daterange"
               range-separator="至"
               start-placeholder="开始日期"
@@ -121,7 +121,7 @@
                       label-width="150px"
                       style="display: block">
           <el-select class="item_width_1"
-                     v-model="dataForm.adminStaffId"
+                     v-model.trim="dataForm.adminStaffId"
                      placeholder="请选择"
                      clearable
                      filterable>
@@ -144,7 +144,7 @@
                       class="item_width_4"
                       maxlength="50"
                       placeholder="请输入关键字"
-                      v-model="dataForm.address"
+                      v-model.trim="dataForm.address"
                     >
                     </el-input>
                     <el-button
@@ -161,7 +161,7 @@
                         class="item_width_3"
                         maxlength="50"
                         placeholder="请输入经度"
-                        v-model="dataForm.longitude"
+                        v-model.trim="dataForm.longitude"
                       >
                       </el-input>
                       <span style="margin-left: 20px">纬度</span>
@@ -169,7 +169,7 @@
                         class="item_width_3"
                         maxlength="50"
                         placeholder="请输入纬度"
-                        v-model="dataForm.latitude"
+                        v-model.trim="dataForm.latitude"
                       >
                       </el-input>
                     </div>
diff --git a/src/views/modules/communityService/shzz/index.vue b/src/views/modules/communityService/shzz/index.vue
index 4868d5a3b..f1b152d07 100644
--- a/src/views/modules/communityService/shzz/index.vue
+++ b/src/views/modules/communityService/shzz/index.vue
@@ -4,13 +4,13 @@
       <div class="">
         <el-form ref="fmData" :inline="true" :model="fmData" class="demo-form-inline">
           <el-form-item label="组织名称" prop="societyName">
-            <el-input v-model="fmData.societyName" placeholder="请输入" class="input-width" clearable></el-input>
+            <el-input v-model.trim="fmData.societyName" placeholder="请输入" class="input-width" clearable></el-input>
           </el-form-item>
           <el-form-item label="服务电话" prop="mobile">
-            <el-input v-model="fmData.mobile" placeholder="请输入" class="input-width" clearable></el-input>
+            <el-input v-model.trim="fmData.mobile" placeholder="请输入" class="input-width" clearable></el-input>
           </el-form-item>
           <el-form-item label="服务时间" prop="serviceTimeStr">
-            <el-input v-model="fmData.serviceTimeStr" placeholder="请输入" class="input-width" clearable></el-input>
+            <el-input v-model.trim="fmData.serviceTimeStr" placeholder="请输入" class="input-width" clearable></el-input>
           </el-form-item>
           <el-form-item>
             <el-button class="diy-button--add" size="small" @click="handleSearch">查询</el-button>
@@ -27,7 +27,7 @@
                       <div class="resi-cell-label">组织名称</div>
                       <div class="resi-cell-value"
                            :class="'resi-cell-value-radio'">
-                        <el-input v-model="fmData.societyName"
+                        <el-input v-model.trim="fmData.societyName"
                                   class="resi-cell-input"
                                   size="small"
                                   clearable
@@ -42,7 +42,7 @@
                       <div class="resi-cell-label">服务电话</div>
                       <div class="resi-cell-value"
                            :class="'resi-cell-value-radio'">
-                        <el-input v-model="fmData.mobile"
+                        <el-input v-model.trim="fmData.mobile"
                                   class="resi-cell-input"
                                   size="small"
                                   clearable
@@ -56,7 +56,7 @@
                       <div class="resi-cell-label">服务时间</div>
                       <div class="resi-cell-value"
                            :class="'resi-cell-value-radio'">
-                        <el-input v-model="fmData.serviceTimeStr"
+                        <el-input v-model.trim="fmData.serviceTimeStr"
                                   class="resi-cell-input"
                                   size="small"
                                   clearable
diff --git a/src/views/modules/communityService/sqzzz/cpts/edit.vue b/src/views/modules/communityService/sqzzz/cpts/edit.vue
index 4adf031f2..534490f7e 100644
--- a/src/views/modules/communityService/sqzzz/cpts/edit.vue
+++ b/src/views/modules/communityService/sqzzz/cpts/edit.vue
@@ -15,14 +15,14 @@
                     maxlength="50"
                     show-word-limit
                     placeholder="请输入组织名称	"
-                    v-model="dataForm.organizationName">
+                    v-model.trim="dataForm.organizationName">
           </el-input>
         </el-form-item>
         <el-form-item label="分类名称	"
                       prop="categoryCode"
                       label-width="150px"
                       style="display: block">
-          <el-select v-model="dataForm.categoryCode"
+          <el-select v-model.trim="dataForm.categoryCode"
                      placeholder="请选择"
                      clearable>
             <el-option v-for="item in categoryList"
@@ -41,7 +41,7 @@
                     maxlength="50"
                     show-word-limit
                     placeholder="请输入组织人数	"
-                    v-model="dataForm.organizationPersonCount">
+                    v-model.trim="dataForm.organizationPersonCount">
           </el-input>
         </el-form-item>
 
@@ -54,7 +54,7 @@
                  :key="'staff' + index"
                  v-for="(item, index) in dataForm.organizationPersonnel">
               <el-autocomplete class="item_width_1"
-                               v-model="item.personName"
+                               v-model.trim="item.personName"
                                :fetch-suggestions="querySearchVolunteer"
                                placeholder="成员姓名"
                                :maxlength="50"
@@ -67,7 +67,7 @@
                         show-word-limit
                         placeholder="联系电话"
                         :disabled="item.icResiUserId != ''"
-                        v-model="item.personPhone" />
+                        v-model.trim="item.personPhone" />
 
               <el-button style="margin-left: 10px"
                          size="small"
@@ -91,7 +91,7 @@
                     show-word-limit
                     :rows="3"
                     placeholder="请输入服务事项，不超过1000字"
-                    v-model="dataForm.serviceItem"></el-input>
+                    v-model.trim="dataForm.serviceItem"></el-input>
         </el-form-item>
 
         <el-form-item label="负责人	"
@@ -102,7 +102,7 @@
                     maxlength="50"
                     show-word-limit
                     placeholder="请输入负责人	"
-                    v-model="dataForm.principalName">
+                    v-model.trim="dataForm.principalName">
           </el-input>
         </el-form-item>
 
@@ -114,7 +114,7 @@
                     maxlength="50"
                     show-word-limit
                     placeholder="请输入联系电话	"
-                    v-model="dataForm.principalPhone">
+                    v-model.trim="dataForm.principalPhone">
           </el-input>
         </el-form-item>
 
@@ -122,7 +122,7 @@
                       prop="organizationCreatedTime"
                       label-width="150px"
                       style="display: block">
-          <el-date-picker v-model="dataForm.organizationCreatedTime"
+          <el-date-picker v-model.trim="dataForm.organizationCreatedTime"
                           placeholder="创建时间"
                           value-format="yyyy-MM-dd">
           </el-date-picker>
@@ -133,7 +133,7 @@
                       label-width="150px"
                       style="display: block">
           <div style="width: 500px">
-            <el-select v-model="searchValue"
+            <el-select v-model.trim="searchValue"
                        filterable
                        style="width: 500px"
                        remote
@@ -161,7 +161,7 @@
                     maxlength="50"
                     show-word-limit
                     placeholder="请输入位置	"
-                    v-model="dataForm.address">
+                    v-model.trim="dataForm.address">
           </el-input>
         </el-form-item>
 
@@ -175,7 +175,7 @@
                     show-word-limit
                     :rows="3"
                     placeholder="请输入备注，不超过500字"
-                    v-model="dataForm.remark"></el-input>
+                    v-model.trim="dataForm.remark"></el-input>
         </el-form-item>
       </el-form>
     </div>
diff --git a/src/views/modules/communityService/sqzzz/index.vue b/src/views/modules/communityService/sqzzz/index.vue
index 28d67ca55..a04c36fed 100644
--- a/src/views/modules/communityService/sqzzz/index.vue
+++ b/src/views/modules/communityService/sqzzz/index.vue
@@ -8,7 +8,7 @@
                class="demo-form-inline">
         <el-form-item label="组织名称"
                       prop="organizationName">
-          <el-input v-model="fmData.organizationName"
+          <el-input v-model.trim="fmData.organizationName"
                     class="resi-cell-input"
                     size="small"
                     clearable
@@ -17,7 +17,7 @@
         </el-form-item>
         <el-form-item label="创建时间"
                       prop="createTime">
-          <el-date-picker v-model="fmData.createTime"
+          <el-date-picker v-model.trim="fmData.createTime"
                           type="daterange"
                           range-separator="至"
                           start-placeholder="开始日期"
@@ -27,7 +27,7 @@
         </el-form-item>
         <el-form-item label="备注"
                       prop="remark">
-          <el-input v-model="fmData.remark"
+          <el-input v-model.trim="fmData.remark"
                     class="resi-cell-input"
                     size="small"
                     clearable
diff --git a/src/views/modules/communityService/wennuanzhaoren/addForm.vue b/src/views/modules/communityService/wennuanzhaoren/addForm.vue
index c0dbcb16e..b28b5775f 100644
--- a/src/views/modules/communityService/wennuanzhaoren/addForm.vue
+++ b/src/views/modules/communityService/wennuanzhaoren/addForm.vue
@@ -1,33 +1,19 @@
 <template>
-  <div>
-    <div
-      class="dialog-h-content scroll-h"
-      :class="{ 'visiual-form': source === 'visiual' }"
-    >
-      <el-form
-        v-if="formType === 'add' || formType === 'edit'"
-        ref="ref_form"
-        :inline="true"
-        :model="formData"
-        :rules="dataRule"
-        class="div_form"
-      >
-      <el-form-item label="服务类别" prop="categoryCode" label-width="150px">
-          <el-cascader
-            v-model="formData.categoryCode"
-            :options="demandOptions"
-            :props="{label: 'categoryName',value: 'categoryCode',children: 'childCateList'}"
-            clearable
-            size="small"
-            class="u-item-width-normal"
-          ></el-cascader>
-          </el-form-item>
-        <!-- <el-form-item label="政策依据"
+    <div>
+        <div class="dialog-h-content scroll-h" :class="{ 'visiual-form': source === 'visiual' }">
+            <el-form v-if="formType === 'add' || formType === 'edit'" ref="ref_form" :inline="true" :model="formData"
+                :rules="dataRule" class="div_form">
+                <el-form-item label="服务类别" prop="categoryCode" label-width="150px">
+                    <el-cascader v-model.trim="formData.categoryCode" :options="demandOptions"
+                        :props="{ label: 'categoryName', value: 'categoryCode', children: 'childCateList' }" clearable
+                        size="small" class="u-item-width-normal"></el-cascader>
+                </el-form-item>
+                <!-- <el-form-item label="政策依据"
                         prop="policyId"
                         label-width="150px"
                         style="display: block">
             <el-select :disabled="formType==='detail'"
-                       v-model="formData.policyId"
+                       v-model.trim="formData.policyId"
                        class="input-width-small"
                        placeholder="请选择"
                        clearable>
@@ -38,202 +24,92 @@
               </el-option>
             </el-select>
           </el-form-item> -->
-        <el-form-item
-          label="服务事项"
-          prop="serviceName"
-          label-width="150px"
-          :class="{ 'form-item': source === 'visiual' }"
-          style="display: block"
-        >
-          <el-input
-            class="item_width_1"
-            placeholder="请输入服务事项"
-            v-model="formData.serviceName"
-          >
-          </el-input>
-        </el-form-item>
-
-        <el-form-item
-          label="服务内容"
-          prop="remark"
-          label-width="150px"
-          :class="{ 'form-item': source === 'visiual' }"
-          style="display: block"
-        >
-          <el-input
-            class="item_width_1"
-            type="textarea"
-            maxlength="1000"
-            show-word-limit
-            :rows="3"
-            placeholder="请输入备注，不超过1000字"
-            v-model="formData.remark"
-          ></el-input>
-        </el-form-item>
-        <el-form-item
-          label="查找享受服务人员"
-          prop="resiSearchTagId"
-          :class="{ 'form-item': source === 'visiual' }"
-          label-width="150px"
-          style="display: block"
-        >
-          <input
-            type="text"
-            v-model="formData.resiSearchTagId"
-            v-show="false"
-          />
-          <template
-            style="margin-right: 10px"
-            v-if="formData.resiSearchTagName"
-          >
-            <el-tag @close="handleCloseTag" closable style="margin-right: 10px">
-              {{ formData.resiSearchTagName }}
-            </el-tag>
-          </template>
-
-          <el-button type="primary" @click="handleClickLabel" size="mini">
-            <span> <i class="el-icon-plus"></i> 按标签查找 </span>
-          </el-button>
-        </el-form-item>
-        <el-form-item
-          label="服务组织"
-          prop="serviceOrgId"
-          label-width="150px"
-          :class="{ 'form-item': source === 'visiual' }"
-          style="display: block"
-        >
-          <el-select
-            v-model="formData.serviceOrgType"
-            class="input-width-small"
-            placeholder="请选择"
-            clearable
-            @change="handleServiceChange('add', $event)"
-          >
-            <el-option
-              v-for="item in serviceOptions"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"
-            >
-            </el-option>
-          </el-select>
-          -
-          <el-select
-            v-model="formData.serviceOrgId"
-            class="input-width-middle"
-            filterable
-            placeholder="请选择"
-            clearable
-          >
-            <el-option
-              v-for="item in serviceOptiondList"
-              :key="item.id"
-              :label="item.label"
-              :value="item.id"
-            >
-            </el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item
-          prop="noticeApproches"
-          label="自动通知服务组织"
-          label-width="150px"
-          style="display: block"
-        >
-          <el-checkbox-group v-model="formData.noticeApproches">
-            <el-checkbox label="sms" >短信通知</el-checkbox>
-            <el-checkbox label="wx_official_account" >微信公众号消息通知</el-checkbox>
-          </el-checkbox-group>
-        </el-form-item>
-        <el-form-item
-          label="服务范围"
-          prop="gridIdList"
-          label-width="150px"
-          :class="{ 'form-item': source === 'visiual' }"
-          style="display: block"
-        >
-          <el-cascader
-            class="item_width_1"
-            ref="myCascader"
-            v-model="scopeIdArray"
-            :key="iscascaderShow"
-            :options="casOptions"
-            :props="optionProps"
-            :show-all-levels="false"
-            collapse-tags
-            @change="handleChangeScope"
-          ></el-cascader>
-        </el-form-item>
-
-        <el-form-item
-          label="服务时间"
-          label-width="150px"
-          :class="{ 'form-item': source === 'visiual' }"
-          prop="serviceTimeStart"
-        >
-          <el-date-picker
-            v-model="formData.serviceTimeStart"
-            :picker-options="startPickerOptions"
-            class="item_width_2"
-            style="width: 220px"
-            type="date"
-            value-format="yyyy-MM-dd HH:mm:ss"
-            value="yyyy-MM-dd"
-            placeholder="开始时间"
-          >
-          </el-date-picker>
-          <span class="u-data-tag">至</span>
-          <el-date-picker
-            v-model="formData.serviceTimeEnd"
-            :picker-options="endPickerOptions"
-            class="item_width_2 u-data-tag"
-            style="width: 220px"
-            type="date"
-            value-format="yyyy-MM-dd HH:mm:ss"
-            value="yyyy-MM-dd"
-            placeholder="结束时间"
-          >
-          </el-date-picker>
-        </el-form-item>
-
-        <el-form-item
-          label="经办人"
-          prop="principalName"
-          :class="{ 'form-item': source === 'visiual' }"
-          label-width="150px"
-          style="display: block"
-        >
-          <el-input
-            class="item_width_1"
-            placeholder="请输入联系人姓名"
-            v-model="formData.principalName"
-          >
-          </el-input>
-        </el-form-item>
-        <el-form-item
-          label="联系方式"
-          prop="principalContact"
-          :class="{ 'form-item': source === 'visiual' }"
-          label-width="150px"
-          style="display: block"
-        >
-          <el-input
-            class="item_width_1"
-            placeholder="请输入联系人电话"
-            v-model="formData.principalContact"
-          >
-          </el-input>
-        </el-form-item>
-        <el-form-item
-            label="上传图片"
-            label-width="150px"
-            style="display: block"
-            prop="attachments"
-            v-if="formType === 'edit'"
-        >
-          <UploadImages :fileList="formData.attachments" @change="(val) => formData.attachments = val"/>
-        </el-form-item>
-        <!-- <el-form-item
+                <el-form-item label="服务事项" prop="serviceName" label-width="150px"
+                    :class="{ 'form-item': source === 'visiual' }" style="display: block">
+                    <el-input class="item_width_1" placeholder="请输入服务事项" v-model.trim="formData.serviceName">
+                    </el-input>
+                </el-form-item>
+
+                <el-form-item label="服务内容" prop="remark" label-width="150px" :class="{ 'form-item': source === 'visiual' }"
+                    style="display: block">
+                    <el-input class="item_width_1" type="textarea" maxlength="1000" show-word-limit :rows="3"
+                        placeholder="请输入备注，不超过1000字" v-model.trim="formData.remark"></el-input>
+                </el-form-item>
+                <el-form-item label="查找享受服务人员" prop="resiSearchTagId" :class="{ 'form-item': source === 'visiual' }"
+                    label-width="150px" style="display: block">
+                    <input type="text" v-model.trim="formData.resiSearchTagId" v-show="false" />
+                    <template style="margin-right: 10px" v-if="formData.resiSearchTagName">
+                        <el-tag @close="handleCloseTag" closable style="margin-right: 10px">
+                            {{ formData.resiSearchTagName }}
+                        </el-tag>
+                    </template>
+
+                    <el-button type="primary" @click="handleClickLabel" size="mini">
+                        <span> <i class="el-icon-plus"></i> 按标签查找 </span>
+                    </el-button>
+                </el-form-item>
+                <el-form-item label="服务组织" prop="serviceOrgId" label-width="150px"
+                    :class="{ 'form-item': source === 'visiual' }" style="display: block">
+                    <el-select v-model.trim="formData.serviceOrgType" class="input-width-small" placeholder="请选择" clearable
+                        @change="handleServiceChange('add', $event)">
+                        <el-option v-for="item in serviceOptions" :key="item.value" :label="item.label" :value="item.value">
+                        </el-option>
+                    </el-select>
+                    -
+                    <el-select v-model.trim="formData.serviceOrgId" class="input-width-middle" filterable placeholder="请选择"
+                        clearable>
+                        <el-option v-for="item in serviceOptiondList" :key="item.id" :label="item.label" :value="item.id">
+                        </el-option>
+                    </el-select>
+                </el-form-item>
+                <el-form-item prop="noticeApproches" label="自动通知服务组织" label-width="150px" style="display: block">
+                    <el-checkbox-group v-model.trim="formData.noticeApproches">
+                        <el-checkbox label="sms">短信通知</el-checkbox>
+                        <el-checkbox label="wx_official_account">微信公众号消息通知</el-checkbox>
+                    </el-checkbox-group>
+                </el-form-item>
+                <el-form-item label="服务范围" prop="gridIdList" label-width="150px"
+                    :class="{ 'form-item': source === 'visiual' }" style="display: block">
+                    <el-cascader class="item_width_1" ref="myCascader" v-model.trim="scopeIdArray" :key="iscascaderShow"
+                        :options="casOptions" :props="optionProps" :show-all-levels="false" collapse-tags
+                        @change="handleChangeScope"></el-cascader>
+                </el-form-item>
+
+                <el-form-item label="服务时间" label-width="150px" :class="{ 'form-item': source === 'visiual' }"
+                    prop="serviceTimeStart">
+                    <el-date-picker v-model.trim="formData.serviceTimeStart" :picker-options="startPickerOptions"
+                        class="item_width_2" style="width: 220px" type="date" value-format="yyyy-MM-dd HH:mm:ss"
+                        value="yyyy-MM-dd" placeholder="开始时间">
+                    </el-date-picker>
+                    <span class="u-data-tag">至</span>
+                    <el-date-picker v-model.trim="formData.serviceTimeEnd" :picker-options="endPickerOptions"
+                        class="item_width_2 u-data-tag" style="width: 220px" type="date" value-format="yyyy-MM-dd HH:mm:ss"
+                        value="yyyy-MM-dd" placeholder="结束时间">
+                    </el-date-picker>
+                </el-form-item>
+
+                <el-form-item label="经办人" prop="principalName" :class="{ 'form-item': source === 'visiual' }"
+                    label-width="150px" style="display: block">
+                    <el-input class="item_width_1" placeholder="请输入联系人姓名" v-model.trim="formData.principalName">
+                    </el-input>
+                </el-form-item>
+                <el-form-item label="联系方式" prop="principalContact" :class="{ 'form-item': source === 'visiual' }"
+                    label-width="150px" style="display: block">
+                    <el-input class="item_width_1" placeholder="请输入联系人电话" v-model.trim="formData.principalContact">
+                    </el-input>
+                </el-form-item>
+                <el-form-item label="服务状态" prop="serviceStatus" :class="{ 'form-item': source === 'visiual' }"
+                    label-width="150px" style="display: block">
+                    <el-select v-model.trim="formData.serviceStatus" placeholder="请选择">
+                        <el-option v-for="e in serviceStatusOptions" :key="e.value" :value="e.value"
+                            :label="e.label"></el-option>
+                    </el-select>
+                </el-form-item>
+                <el-form-item label="上传图片" label-width="150px" style="display: block" prop="attachments"
+                    v-if="formType === 'edit'">
+                    <UploadImages :fileList="formData.attachments" @change="(val) => formData.attachments = val" />
+                </el-form-item>
+                <!-- <el-form-item
           label="直接反馈"
           prop="remark"
           label-width="150px"
@@ -242,100 +118,50 @@
         >
           <el-checkbox
             :label="'是'"
-            v-model="showFeedback"
+            v-model.trim="showFeedback"
             @change="handleChangeFeedback"
           ></el-checkbox>
         </el-form-item> -->
-      </el-form>
-      <div v-show="formType === 'feedback' || showFeedback">
-        <!-- <h3 class="d-h3">反馈内容</h3> -->
-
-        <el-form
-          ref="ref_form_feedback"
-          :inline="true"
-          :model="feedbackFormData"
-          :rules="feedbackDataRule"
-          class="div_form"
-        >
-          <el-form-item
-            label="满意度"
-            style="display: block"
-            label-width="150px"
-            :class="{ 'form-item': source === 'visiual' }"
-            prop="satisfaction"
-          >
-            <el-select
-              class="item_width_2"
-              v-model="feedbackFormData.satisfaction"
-              placeholder="全部"
-              clearable
-            >
-              <el-option
-                v-for="item in satisfyArray"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-              >
-              </el-option>
-            </el-select>
-          </el-form-item>
-          <el-form-item
-            label="备注"
-            prop="serviceGoal"
-            :class="{ 'form-item': source === 'visiual' }"
-            label-width="150px"
-            style="display: block"
-          >
-            <el-input
-              class="item_width_1"
-              type="textarea"
-              maxlength="1000"
-              show-word-limit
-              :rows="3"
-              v-model="feedbackFormData.serviceGoal"
-            ></el-input>
-          </el-form-item>
-        </el-form>
-      </div>
-    </div>
-
-    <div class="div_btn">
-      <el-button size="small" @click="handleCancle">取 消</el-button>
-      <el-button
-        size="small"
-        type="primary"
-        :disabled="btnDisable"
-        @click="handleComfirm"
-        >确 定</el-button
-      >
-    </div>
-
-    <el-dialog
-      v-if="showLabelForm"
-      :visible.sync="showLabelForm"
-      :append-to-body="true"
-      :close-on-click-modal="false"
-      :close-on-press-escape="false"
-      :title="'标签配置'"
-      width="954px"
-      top="5vh"
-      class="dialog-h"
-      @closed="showLabelForm = false"
-    >
-      <label-form
-        ref="ref_label_form"
-        :ruleList="ruleList"
-        @dialogCancle="addFormCancle"
-        @dialogOk="addFormOk"
-      >
-        <!--    @handleOk="handleOk"
+            </el-form>
+            <div v-show="formType === 'feedback' || showFeedback">
+                <!-- <h3 class="d-h3">反馈内容</h3> -->
+
+                <el-form ref="ref_form_feedback" :inline="true" :model="feedbackFormData" :rules="feedbackDataRule"
+                    class="div_form">
+                    <el-form-item label="满意度" style="display: block" label-width="150px"
+                        :class="{ 'form-item': source === 'visiual' }" prop="satisfaction">
+                        <el-select class="item_width_2" v-model.trim="feedbackFormData.satisfaction" placeholder="全部" clearable>
+                            <el-option v-for="item in satisfyArray" :key="item.value" :label="item.label"
+                                :value="item.value">
+                            </el-option>
+                        </el-select>
+                    </el-form-item>
+                    <el-form-item label="备注" prop="serviceGoal" :class="{ 'form-item': source === 'visiual' }"
+                        label-width="150px" style="display: block">
+                        <el-input class="item_width_1" type="textarea" maxlength="1000" show-word-limit :rows="3"
+                            v-model.trim="feedbackFormData.serviceGoal"></el-input>
+                    </el-form-item>
+                </el-form>
+            </div>
+        </div>
+
+        <div class="div_btn">
+            <el-button size="small" @click="handleCancle">取 消</el-button>
+            <el-button size="small" type="primary" :disabled="btnDisable" @click="handleComfirm">确 定</el-button>
+        </div>
+
+        <el-dialog v-if="showLabelForm" :visible.sync="showLabelForm" :append-to-body="true" :close-on-click-modal="false"
+            :close-on-press-escape="false" :title="'标签配置'" width="954px" top="5vh" class="dialog-h"
+            @closed="showLabelForm = false">
+            <label-form ref="ref_label_form" :ruleList="ruleList" @dialogCancle="addFormCancle" @dialogOk="addFormOk">
+                <!--    @handleOk="handleOk"
           @handleClose="handleClose" -->
-      </label-form>
-    </el-dialog>
-  </div>
+            </label-form>
+        </el-dialog>
+    </div>
 </template>
   
-    <script>
+<script>
 import { mapGetters } from "vuex";
 import { Loading } from "element-ui"; // 引入Loading服务
 import { requestPost, requestGet } from "@/js/dai/request";
@@ -349,718 +175,721 @@ let loading; // 加载动画
 let map;
 
 export default {
-  props: {
-    defaultData: {
-      type: Object,
-      default: null,
-    },
-    serviceRecordId: {
-      type: String,
-      required: "",
-    },
-    serviceProjectName: {
-      //服务项目名称
-      type: String,
-      required: false,
-      default: "",
-    },
-    formType: {
-      //表单操作类型 add新增，edit编辑，detail详情,feedback反馈
-      type: String,
-      required: "",
-    },
-    categrayArray: {
-      type: Array,
-      default() {
-        return [];
-      },
-    },
-    source: {
-      //展示来源：manage  管理平台    visiual  可视化平台
-      type: String,
-      default: "manage",
-    },
-  },
-
-  data() {
-    let endDisabledDate = (time) => {
-      //这个关键属性我们一定要写在data的里面并且return的外面，这是动态改变区间的关键
-      let nowData = Date.now();
-      if (this.formData.serviceTimeStart) {
-        let serviceTimeStart = new Date(this.formData.serviceTimeStart);
-        return (
-          time.getTime() < serviceTimeStart- 24 * 60 * 60 * 1000 ||
-          time.getTime() === serviceTimeStart- 24 * 60 * 60 * 1000
-        );
-      } else {
-        return (time.getTime() > nowData || time.getTime() === nowData) ;
-      }
-    };
-    let startDisabledDate = (time) => {
-      //这个关键属性我们一定要写在data的里面并且return的外面，这是动态改变区间的关键
-      let nowData = Date.now() - 24 * 60 * 60 * 1000;
-      return time.getTime() < nowData;
-    };
-    return {
-
-      btnDisable: false,
-      casOptions: [],
-      scopeIdArray: [],
-      iscascaderShow: 0,
-
-      optionProps: {
-        multiple: true,
-        value: "objectId",
-        label: "objectName",
-        children: "children",
-        checkStrictly: true,
-        emitPath: false,
-      },
-
-      keyWords: "",
-      formData: {
-        categoryCode:[],
-        parentCategoryCode:'',
-        resiSearchTagId: "", //查找享受服务人员
-        resiSearchTagName: "", //享受服务人员名称
-        serviceName: "", //服务事项
-        noticeApproches: [], //通知服务组织
-        policyId: "", //政策依据
-        serviceOrgType: "", //服务组织类型 社区自组织：community_org， 志愿者：ic_user_volunteer， 联建单位：party_unit
-        serviceOrgId: "", //服务组织Id
-        gridIdList: [], //
-        principalName: "", //经办人(责任人)姓名
-        principalContact: "", //经办人联系方式
-        serviceTimeStart: "", //服务起始时间yyyy-MM-dd
-        serviceTimeEnd: "", //服务截止时间yyyy-MM-dd
-        dataCategoryCode:"warm",
-        remark: "", //
-        attachments: []
-      },
-      feedbackFormData: {
-        serviceGoal: "", //	服务目标
-        serviceEffect: "", //	服务效果
-        servicePeopleNumber: null, //	服务人数
-        serviceStatus: "completed", //	服务状态。in_service服务中；completed:已完成
-        satisfaction: "", //满意度。不满意:bad、基本满意:good、非常满意:perfect
-        longitude: "", //	经度
-        latitude: "", //	维度
-        address: "",
-        fileList: [], //	附件列表
-      },
-      sarr: [],
-      dataRule: {
-        categoryCode: [
-          { required: true, message: "服务类别不能为空", trigger: "change" },
-        ],
-        serviceName: [
-          { required: true, message: "服务事项不能为空", trigger: "change" },
-        ],
-        serviceOrgId: [
-          { required: true, message: "服务组织不能为空", trigger: "change" },
-        ],
-
-        serviceTimeStart: [
-          { required: true, message: "服务时间不能为空", trigger: "change" },
-        ],
-        gridIdList: [
-          { required: true, message: "服务范围不能为空", trigger: "change" },
-        ],
-        resiSearchTagId: [
-          { required: true, message: "享受服务人员不能为空", trigger: "blur" },
-        ],
-      },
-
-      endPickerOptions: {
-        disabledDate: endDisabledDate,
-      },
-      startPickerOptions: {
-        disabledDate: startDisabledDate,
-      },
-
-      serviceOptions: [],
-      serviceOptiondList: [],
-      policyList: [],
-
-      fileList: [],
-      uploadUlr: window.SITE_CONFIG["apiURL"] + "/oss/file/uploadvariedfile",
-
-      showPersonList: false,
-      ruleList: [],
-      firstInitMap: true,
-
-      categrayOptions: [],
-      statusArray: [
-        {
-          value: "in_service",
-          label: "进行中",
+    props: {
+        defaultData: {
+            type: Object,
+            default: null,
         },
-        {
-          value: "completed",
-          label: "已完成",
+        serviceRecordId: {
+            type: String,
+            required: "",
         },
-      ],
-      satisfyArray: [
-        {
-          value: "bad",
-          label: "不满意",
+        serviceProjectName: {
+            //服务项目名称
+            type: String,
+            required: false,
+            default: "",
         },
-        {
-          value: "good",
-          label: "基本满意",
+        formType: {
+            //表单操作类型 add新增，edit编辑，detail详情,feedback反馈
+            type: String,
+            required: "",
         },
-        {
-          value: "perfect",
-          label: "非常满意",
+        categrayArray: {
+            type: Array,
+            default() {
+                return [];
+            },
+        },
+        source: {
+            //展示来源：manage  管理平台    visiual  可视化平台
+            type: String,
+            default: "manage",
         },
-      ],
-      showLabelForm: false,
-      showFeedback: false,
-      demandOptions:[],
-    };
-  },
-
-  computed: {
-    feedbackDataRule() {
-      return {
-        // serviceGoal: [
-        //   { required: true, message: "服务目标不能为空", trigger: "blur" },
-        // ],
-
-        serviceEffect: [
-          { required: true, message: "服务效果不能为空", trigger: "blur" },
-        ],
-        servicePeopleNumber: [
-          { required: true, message: "服务人数不能为空", trigger: "blur" },
-        ],
-        serviceStatus: [
-          { required: true, message: "服务状态不能为空", trigger: "blur" },
-        ],
-        satisfaction: [
-          { required: true, message: "满意度不能为空", trigger: "blur" },
-        ],
-        address: [{ required: true, message: "地址不能为空", trigger: "blur" }],
-      };
-    },
-  },
-
-  watch: {
-    "formData.serviceTimeEnd": function (val) {
-      if (val && val != "") {
-        let arrayTemp = val.split(" ");
-        this.formData.serviceTimeEnd = arrayTemp[0] + " 23:59:59";
-      }
-    },
-  },
-
-  components: { labelForm, UploadImages },
-
-  async mounted() {
-    this.startLoading();
-    // 都已经重置了，还放在prop里干嘛，我不理解
-    this.categrayOptions = this.categrayArray;
-
-    // this.getCategrayList();
-    this.getDictOptions();
-    this.getPolicyList();
-    await this.loadScopeTree();
-    await this.getDemandOptions()
-    if (this.formType === "add") {
-      this.$refs.ref_form.resetFields();
-    } else if (this.formType == "edit") {
-      await this.loadInfo();
-    }
-
-    await this.iniDefaultData();
-    this.endLoading();
-    // 服务分类下拉（其实是获取的共性服务分类）
-  },
-
-  methods: {
-    handelDisabledRules(v) {
-      if (!v) {
-        delete this.dataRule.resiSearchTagId;
-      } else {
-        var arr = [
-          {
-            required: true,
-            message: "享受服务人员不能为空",
-            trigger: "change",
-          },
-        ];
-        this.dataRule.resiSearchTagId = arr;
-      }
-      console.log(this.dataRule);
-    },
-    //获取服务详情数据
-    async loadInfo() {
-      const url = "/governance/icServiceWarmRecord/detail";
-      let params = {
-        serviceRecordId: this.serviceRecordId,
-      };
-
-      const { data, code, msg } = await requestPost(url, params);
-
-      if (code === 0) {
-        this.formData = { ...data };
-        if (data.categoryCode) {
-          this.formData.categoryCode = [data.parentCategoryCode, data.categoryCode];
-        } else {
-          this.formData.categoryCode = [data.parentCategoryCode];
-        }
-        if(!data.noticeApproches){
-          this.formData.noticeApproches = [];
-        }
-        this.scopeIdArray = data.gridIdList.map(i => i.objectId);
-        this.feedbackFormData = { ...data.feedback };
-        await this.getServiceuserList(data.serviceOrgType);
-        await this.getTagName();
-        // this.fileList = []
-        // if (data.feedback && data.feedback.fileList && data.feedback.fileList.length > 0) {
-        //   data.feedback.fileList.forEach(element => {
-        //     let obj = {
-        //       name: element.name,
-        //       format: element.format,
-        //       url: element.url,
-        //     }
-        //     this.fileList.push(obj)
-        //   });
-        // }
-      } else {
-        this.$message.error(msg);
-      }
-    },
-    async getTagName() {
-      const url = "/governance/resiSearchTag/listResiSearchTags";
-      let params = {
-        pageSize: 99,
-      };
-      let { data, msg, code } = await requestPost(url, params);
-      if (code == 0) {
-        let showAddProduct = data.list.filter((item) => {
-          return [this.formData.resiSearchTagId].includes(item.tagId);
-        });
-        this.formData.resiSearchTagName = showAddProduct[0].tagName;
-      } else {
-        this.$message.error(msg);
-      }
-    },
-   
-    handleClickLabel() {
-      this.showLabelForm = true;
-      this.$nextTick(() => {
-        this.$refs["ref_label_form"].initForm("info");
-      });
-    },
-    addFormOk(val) {
-      this.showLabelForm = false;
-      this.formData.resiSearchTagId = val.tagId;
-      this.formData.resiSearchTagName = val.tagName;
-    },
-    addFormCancle() {
-      this.showLabelForm = false;
-    },
-    handleCloseTag() {
-      this.formData.resiSearchTagId = "";
-      this.formData.resiSearchTagName = "";
-    },
-    getLastItem(list, vals, key) {
-      let LIST = list || [];
-      for (let item of LIST) {
-        for (let i of vals) {
-          if (item[key] === i) {
-            this.sarr.push(item);
-          } else if (item["objectType"] == "district") {
-            this.getLastItem(item.children, vals, key);
-          } else {
-            this.getLastItem(item.children, vals, key);
-          }
-        }
-      }
-    },
-    async handleTreeList() {
-      const map = new Map();
-      await this.getLastItem(this.casOptions, this.scopeIdArray, "objectId");
-      let temp = [];
-      //递归出的数据会有重复,因为一个街道下面有两个社区的话就会循环push两遍,在这里去重
-      temp = this.sarr.filter(
-        (v) => !map.has(v.objectId) && map.set(v.objectId, 1)
-      );
-      for (let i in temp) {
-        this.scopeIdArray.push({
-          objectId: temp[i].objectId,
-          objectType: temp[i].objectType,
-          objectName: temp[i].objectName,
-        });
-      }
-      temp = [];
-      //  如果是编辑的话回填的数据会有数组字符串需要将不是对象属性的过滤掉
-      let arr = [];
-      // let isOk = false;
-      this.scopeIdArray.forEach((item) => {
-        if (typeof item != "string") {
-          arr.push(item);
-        }
-      });
-      return arr;
-    },
-    handleChangeFeedback(val) {
-      this.showFeedback = val;
-
-      // if (this.firstInitMap) {
-      //   this.$nextTick(() => {
-      //     this.initMap();
-      //   });
-      // }
-    },
-    async iniDefaultData() {
-      const { defaultData } = this;
-      if (defaultData) {
-        const { serviceOrgType, serviceOrgId, scopeIdArray } = defaultData;
-        if (serviceOrgType) {
-          this.formData.serviceOrgType = serviceOrgType;
-          await this.getServiceuserList(serviceOrgType, "add_demand");
-        }
-        if (serviceOrgId) {
-          this.formData.serviceOrgId = serviceOrgId;
-        }
-        if (scopeIdArray) {
-          this.scopeIdArray = scopeIdArray;
-          // await nextTick();
-          // this.handleChangeScope();
-        }
-      }
     },
 
-    handleClose() {
-      this.showPersonList = false;
-    },
-    handleOk() {
-      this.showPersonList = false;
+    data() {
+        let endDisabledDate = (time) => {
+            //这个关键属性我们一定要写在data的里面并且return的外面，这是动态改变区间的关键
+            let nowData = Date.now();
+            if (this.formData.serviceTimeStart) {
+                let serviceTimeStart = new Date(this.formData.serviceTimeStart);
+                return (
+                    time.getTime() < serviceTimeStart - 24 * 60 * 60 * 1000 ||
+                    time.getTime() === serviceTimeStart - 24 * 60 * 60 * 1000
+                );
+            } else {
+                return (time.getTime() > nowData || time.getTime() === nowData);
+            }
+        };
+        let startDisabledDate = (time) => {
+            //这个关键属性我们一定要写在data的里面并且return的外面，这是动态改变区间的关键
+            let nowData = Date.now() - 24 * 60 * 60 * 1000;
+            return time.getTime() < nowData;
+        };
+        return {
+
+            btnDisable: false,
+            casOptions: [],
+            scopeIdArray: [],
+            iscascaderShow: 0,
+
+            optionProps: {
+                multiple: true,
+                value: "objectId",
+                label: "objectName",
+                children: "children",
+                checkStrictly: true,
+                emitPath: false,
+            },
+            serviceStatusOptions: [{ 'label': '进行中', 'value': 'in_service' }, { 'label': '已完成', 'value': 'completed' }, { 'label': '取消', 'value': 'cancel' }], 
+            keyWords: "",
+            formData: {
+                categoryCode: [],
+                parentCategoryCode: '',
+                resiSearchTagId: "", //查找享受服务人员
+                resiSearchTagName: "", //享受服务人员名称
+                serviceName: "", //服务事项
+                noticeApproches: [], //通知服务组织
+                policyId: "", //政策依据
+                serviceOrgType: "", //服务组织类型 社区自组织：community_org， 志愿者：ic_user_volunteer， 联建单位：party_unit
+                serviceOrgId: "", //服务组织Id
+                gridIdList: [], //
+                principalName: "", //经办人(责任人)姓名
+                principalContact: "", //经办人联系方式
+                serviceTimeStart: "", //服务起始时间yyyy-MM-dd
+                serviceTimeEnd: "", //服务截止时间yyyy-MM-dd
+                serviceStatus: "", //服务状态 in_service服务中；completed:已完成；cancel：取消
+                dataCategoryCode: "warm",
+                remark: "", //
+                attachments: []
+            },
+            feedbackFormData: {
+                serviceGoal: "", //	服务目标
+                serviceEffect: "", //	服务效果
+                servicePeopleNumber: null, //	服务人数
+                serviceStatus: "completed", //	服务状态。in_service服务中；completed:已完成
+                satisfaction: "", //满意度。不满意:bad、基本满意:good、非常满意:perfect
+                longitude: "", //	经度
+                latitude: "", //	维度
+                address: "",
+                fileList: [], //	附件列表
+            },
+            sarr: [],
+            dataRule: {
+                categoryCode: [
+                    { required: true, message: "服务类别不能为空", trigger: "change" },
+                ],
+                serviceName: [
+                    { required: true, message: "服务事项不能为空", trigger: "change" },
+                ],
+                serviceOrgId: [
+                    { required: true, message: "服务组织不能为空", trigger: "change" },
+                ],
+
+                serviceTimeStart: [
+                    { required: true, message: "服务时间不能为空", trigger: "change" },
+                ],
+                gridIdList: [
+                    { required: true, message: "服务范围不能为空", trigger: "change" },
+                ],
+                resiSearchTagId: [
+                    { required: true, message: "享受服务人员不能为空", trigger: "blur" },
+                ],
+            },
+
+            endPickerOptions: {
+                disabledDate: endDisabledDate,
+            },
+            startPickerOptions: {
+                disabledDate: startDisabledDate,
+            },
+
+            serviceOptions: [],
+            serviceOptiondList: [],
+            policyList: [],
+
+            fileList: [],
+            uploadUlr: window.SITE_CONFIG["apiURL"] + "/oss/file/uploadvariedfile",
+
+            showPersonList: false,
+            ruleList: [],
+            firstInitMap: true,
+
+            categrayOptions: [],
+            statusArray: [
+                {
+                    value: "in_service",
+                    label: "进行中",
+                },
+                {
+                    value: "completed",
+                    label: "已完成",
+                },
+            ],
+            satisfyArray: [
+                {
+                    value: "bad",
+                    label: "不满意",
+                },
+                {
+                    value: "good",
+                    label: "基本满意",
+                },
+                {
+                    value: "perfect",
+                    label: "非常满意",
+                },
+            ],
+            showLabelForm: false,
+            showFeedback: false,
+            demandOptions: [],
+        };
     },
 
-    async getPolicyList() {
-      const url = "/governance/policy/policyList";
-
-      let params = {};
-
-      const { data, code, msg } = await requestPost(url, params);
-
-      if (code === 0) {
-        this.policyList = data;
-      } else {
-        this.$message.error(msg);
-      }
+    computed: {
+        feedbackDataRule() {
+            return {
+                // serviceGoal: [
+                //   { required: true, message: "服务目标不能为空", trigger: "blur" },
+                // ],
+
+                serviceEffect: [
+                    { required: true, message: "服务效果不能为空", trigger: "blur" },
+                ],
+                servicePeopleNumber: [
+                    { required: true, message: "服务人数不能为空", trigger: "blur" },
+                ],
+                serviceStatus: [
+                    { required: true, message: "服务状态不能为空", trigger: "blur" },
+                ],
+                satisfaction: [
+                    { required: true, message: "满意度不能为空", trigger: "blur" },
+                ],
+                address: [{ required: true, message: "地址不能为空", trigger: "blur" }],
+            };
+        },
     },
 
-    async getDictOptions() {
-      this.$http
-        .post("/sys/dict/data/dictlist", {
-          dictType: "user_demand_service_type",
-        })
-        .then(({ data: res }) => {
-          if (res.code !== 0) {
-            return this.$message.error(res.msg);
-          } else {
-            this.serviceOptions = res.data.filter(item=>item.value == 'party_unit'||item.value == 'community_org');
-          }
-        })
-        .catch(() => {
-          return this.$message.error("网络错误");
-        });
+    watch: {
+        "formData.serviceTimeEnd": function (val) {
+            if (val && val != "") {
+                let arrayTemp = val.split(" ");
+                this.formData.serviceTimeEnd = arrayTemp[0] + " 23:59:59";
+            }
+        },
     },
 
-    // 字典
-    // async getCategrayList() {
-    //   const url = "/sys/dict/data/dictlist";
-
-    //   let params = {
-    //     dictType: "ic_service_type",
-    //   };
+    components: { labelForm, UploadImages },
 
-    //   const { data, code, msg } = await requestPost(url, params);
+    async mounted() {
+        this.startLoading();
+        // 都已经重置了，还放在prop里干嘛，我不理解
+        this.categrayOptions = this.categrayArray;
 
-    //   if (code === 0) {
-    //     this.categrayOptions = data;
-    //   } else {
-    //     this.$message.error(msg);
-    //   }
-    // },
-    async getDemandOptions() {
-      this.$http
-        .post("/actual/base/serviceitem/listAllCategory")
-        .then(({ data: res }) => {
-          if (res.code !== 0) {
-            return this.$message.error(res.msg);
-          } else {
-            this.demandOptions = this.getFlagData(
-              this.getTreeData(res.data),
-              "usableFlag"
-            ).filter((item) => item.categoryCode == '1040');
-          }
-        })
-        .catch(() => {
-          return this.$message.error("网络错误");
-        });
-    },
-    getFlagData(data, flag) {
-      if (!Array.isArray(data)) return [];
-      let arr1 = data.filter((item) => item[flag]);
-      let arr2 = arr1.map((item) => {
-        if (item.childCateList)
-          return { ...item, childCateList: this.getFlagData(item.childCateList, flag) };
-        else return item;
-      });
-      // console.log('arrr-oppp', arr2)
-      return arr2;
-    },
-    getTreeData(data) {
-      if (!Array.isArray(data)) return [];
-      let arr = data.map((item) => {
-        let _item = {};
-        if (item.childCateList) {
-          if (item.childCateList.length === 0)
-            _item = { ...item, childCateList: undefined };
-          else _item = { ...item, childCateList: this.getTreeData(item.childCateList) };
-        } else {
-          _item = { ...item };
+        // this.getCategrayList();
+        this.getDictOptions();
+        this.getPolicyList();
+        await this.loadScopeTree();
+        await this.getDemandOptions()
+        if (this.formType === "add") {
+            this.$refs.ref_form.resetFields();
+        } else if (this.formType == "edit") {
+            await this.loadInfo();
         }
-        return _item;
-      });
-      return arr;
-    },
-    async handleServiceChange(type, val) {
-      console.log(val);
-      if (val === "social_org") {
-        if (type === "add") await this.getServiceuserList(val);
-        else this.getServiceuserList(val);
-      } else this.getServiceuserList(val);
-    },
 
-    async getServiceuserList(serverOrgType) {
-      if (!serverOrgType) return false;
-      if (this.formData.categoryCode.length === 0) {
-        this.$message.error("请先选择需求类型!");
-        return;
-      }
-      const url = "/actual/base/serviceitem/listServerOrgNewTask";
-      let params = {
-        serverOrgCategoryCode: this.formData.categoryCode[1],
-        serverParentOrgCategoryCode:this.formData.categoryCode[0],
-        serverOrgType: serverOrgType,
-      };
-      let { data, code, msg } = await requestPost(url, params);
-      if (code == 0) {
-        this.serviceOptiondList = data;
-      } else if (code >= 8000) {
-        this.$message.error(msg);
-      }
-    },
+        await this.iniDefaultData();
+        this.endLoading();
+        // 服务分类下拉（其实是获取的共性服务分类）
+    },
+
+    methods: {
+        handelDisabledRules(v) {
+            if (!v) {
+                delete this.dataRule.resiSearchTagId;
+            } else {
+                var arr = [
+                    {
+                        required: true,
+                        message: "享受服务人员不能为空",
+                        trigger: "change",
+                    },
+                ];
+                this.dataRule.resiSearchTagId = arr;
+            }
+            console.log(this.dataRule);
+        },
+        //获取服务详情数据
+        async loadInfo() {
+            const url = "/governance/icServiceWarmRecord/detail";
+            let params = {
+                serviceRecordId: this.serviceRecordId,
+            };
+
+            const { data, code, msg } = await requestPost(url, params);
+
+            if (code === 0) {
+                this.formData = { ...data };
+                if (data.categoryCode) {
+                    this.formData.categoryCode = [data.parentCategoryCode, data.categoryCode];
+                } else {
+                    this.formData.categoryCode = [data.parentCategoryCode];
+                }
+                if (!data.noticeApproches) {
+                    this.formData.noticeApproches = [];
+                }
+                this.scopeIdArray = data.gridIdList.map(i => i.objectId);
+                this.feedbackFormData = { ...data.feedback };
+                await this.getServiceuserList(data.serviceOrgType);
+                await this.getTagName();
+                // this.fileList = []
+                // if (data.feedback && data.feedback.fileList && data.feedback.fileList.length > 0) {
+                //   data.feedback.fileList.forEach(element => {
+                //     let obj = {
+                //       name: element.name,
+                //       format: element.format,
+                //       url: element.url,
+                //     }
+                //     this.fileList.push(obj)
+                //   });
+                // }
+            } else {
+                this.$message.error(msg);
+            }
+        },
+        async getTagName() {
+            const url = "/governance/resiSearchTag/listResiSearchTags";
+            let params = {
+                pageSize: 99,
+            };
+            let { data, msg, code } = await requestPost(url, params);
+            if (code == 0) {
+                let showAddProduct = data.list.filter((item) => {
+                    return [this.formData.resiSearchTagId].includes(item.tagId);
+                });
+                this.formData.resiSearchTagName = showAddProduct[0].tagName;
+            } else {
+                this.$message.error(msg);
+            }
+        },
 
-    // 获取服务范围树
-    async loadScopeTree() {
-      const url = "/gov/org/icServiceProject/service/serviceScopeTree";
-      // const url = 'http://yapi.elinkservice.cn/mock/245/gov/org/isServiceProject/service/serviceScopeTree'
-      let params = {};
+        handleClickLabel() {
+            this.showLabelForm = true;
+            this.$nextTick(() => {
+                this.$refs["ref_label_form"].initForm("info");
+            });
+        },
+        addFormOk(val) {
+            this.showLabelForm = false;
+            this.formData.resiSearchTagId = val.tagId;
+            this.formData.resiSearchTagName = val.tagName;
+        },
+        addFormCancle() {
+            this.showLabelForm = false;
+        },
+        handleCloseTag() {
+            this.formData.resiSearchTagId = "";
+            this.formData.resiSearchTagName = "";
+        },
+        getLastItem(list, vals, key) {
+            let LIST = list || [];
+            for (let item of LIST) {
+                for (let i of vals) {
+                    if (item[key] === i) {
+                        this.sarr.push(item);
+                    } else if (item["objectType"] == "district") {
+                        this.getLastItem(item.children, vals, key);
+                    } else {
+                        this.getLastItem(item.children, vals, key);
+                    }
+                }
+            }
+        },
+        async handleTreeList() {
+            const map = new Map();
+            await this.getLastItem(this.casOptions, this.scopeIdArray, "objectId");
+            let temp = [];
+            //递归出的数据会有重复,因为一个街道下面有两个社区的话就会循环push两遍,在这里去重
+            temp = this.sarr.filter(
+                (v) => !map.has(v.objectId) && map.set(v.objectId, 1)
+            );
+            for (let i in temp) {
+                this.scopeIdArray.push({
+                    objectId: temp[i].objectId,
+                    objectType: temp[i].objectType,
+                    objectName: temp[i].objectName,
+                });
+            }
+            temp = [];
+            //  如果是编辑的话回填的数据会有数组字符串需要将不是对象属性的过滤掉
+            let arr = [];
+            // let isOk = false;
+            this.scopeIdArray.forEach((item) => {
+                if (typeof item != "string") {
+                    arr.push(item);
+                }
+            });
+            return arr;
+        },
+        handleChangeFeedback(val) {
+            this.showFeedback = val;
+
+            // if (this.firstInitMap) {
+            //   this.$nextTick(() => {
+            //     this.initMap();
+            //   });
+            // }
+        },
+        async iniDefaultData() {
+            const { defaultData } = this;
+            if (defaultData) {
+                const { serviceOrgType, serviceOrgId, scopeIdArray } = defaultData;
+                if (serviceOrgType) {
+                    this.formData.serviceOrgType = serviceOrgType;
+                    await this.getServiceuserList(serviceOrgType, "add_demand");
+                }
+                if (serviceOrgId) {
+                    this.formData.serviceOrgId = serviceOrgId;
+                }
+                if (scopeIdArray) {
+                    this.scopeIdArray = scopeIdArray;
+                    // await nextTick();
+                    // this.handleChangeScope();
+                }
+            }
+        },
 
-      const { data, code, msg } = await requestPost(url, params);
+        handleClose() {
+            this.showPersonList = false;
+        },
+        handleOk() {
+            this.showPersonList = false;
+        },
 
-      if (code === 0) {
-        ++this.iscascaderShow;
-        this.casOptions = [];
-        this.scopeIdArray = [];
-        this.casOptions.push(data);
-      } else {
-        this.$message.error(rspMsg);
-      }
-    },
+        async getPolicyList() {
+            const url = "/governance/policy/policyList";
 
-    handleChangeScope(value) {
-      this.formData.gridIdList = [];
-      let selArray = this.$refs["myCascader"].getCheckedNodes();
-      selArray.forEach((element) => {
-        let obj = {
-          objectType: element.data.objectType,
-          objectId: element.data.objectId,
-          objectName: element.data.objectName,
-        };
-        this.formData.gridIdList.push(obj);
-      });
-    },
+            let params = {};
 
-    async handleComfirm() {
-      if (this.formType === "add") {
-        this.handleAdd();
-      } else if (this.formType === "feedback") {
-        this.handleFeedback();
-      } else if (this.formType === "edit") {
-        this.handleAdd();
-      }
-    },
+            const { data, code, msg } = await requestPost(url, params);
 
-    async handleAdd() {
-      this.btnDisable = true;
-      setTimeout(() => {
-        this.btnDisable = false;
-      }, 10000);
-      this.formData.gridIdList = await this.handleTreeList();
-      this.$refs["ref_form"].validate((valid, messageObj) => {
-        if (!valid) {
-          app.util.validateRule(messageObj);
-          this.btnDisable = false;
-        } else {
-          var oDate1 = new Date(this.formData.serviceTimeStart);
-          var oDate2 = new Date(this.formData.serviceTimeEnd);
-          if (oDate1.getTime() > oDate2.getTime()) {
-            this.$message.error("服务截止时间必须大于服务开始时间");
-            return false;
-          }
-          this.addFuwu();
-        }
-      });
-    },
-    async handleFeedback() {
-      this.btnDisable = true;
-      setTimeout(() => {
-        this.btnDisable = false;
-      }, 10000);
+            if (code === 0) {
+                this.policyList = data;
+            } else {
+                this.$message.error(msg);
+            }
+        },
 
-      this.$refs["ref_form_feedback"].validate((valid, messageObj) => {
-        if (!valid) {
-          app.util.validateRule(messageObj);
-          this.btnDisable = false;
-        } else {
-          this.addFeecback();
-        }
-      });
-    },
-    async addFeecback() {
-      // this.feedbackFormData.fileList = [];
-      // this.feedbackFormData.fileList = [...this.fileList];
-      this.feedbackFormData.serviceRecordId = this.serviceRecordId;
+        async getDictOptions() {
+            this.$http
+                .post("/sys/dict/data/dictlist", {
+                    dictType: "user_demand_service_type",
+                })
+                .then(({ data: res }) => {
+                    if (res.code !== 0) {
+                        return this.$message.error(res.msg);
+                    } else {
+                        this.serviceOptions = res.data.filter(item => item.value == 'party_unit' || item.value == 'community_org');
+                    }
+                })
+                .catch(() => {
+                    return this.$message.error("网络错误");
+                });
+        },
 
-      console.log(this.feedbackFormData);
+        // 字典
+        // async getCategrayList() {
+        //   const url = "/sys/dict/data/dictlist";
+
+        //   let params = {
+        //     dictType: "ic_service_type",
+        //   };
+
+        //   const { data, code, msg } = await requestPost(url, params);
+
+        //   if (code === 0) {
+        //     this.categrayOptions = data;
+        //   } else {
+        //     this.$message.error(msg);
+        //   }
+        // },
+        async getDemandOptions() {
+            this.$http
+                .post("/actual/base/serviceitem/listAllCategory")
+                .then(({ data: res }) => {
+                    if (res.code !== 0) {
+                        return this.$message.error(res.msg);
+                    } else {
+                        this.demandOptions = this.getFlagData(
+                            this.getTreeData(res.data),
+                            "usableFlag"
+                        ).filter((item) => item.categoryCode == '1040');
+                    }
+                })
+                .catch(() => {
+                    return this.$message.error("网络错误");
+                });
+        },
+        getFlagData(data, flag) {
+            if (!Array.isArray(data)) return [];
+            let arr1 = data.filter((item) => item[flag]);
+            let arr2 = arr1.map((item) => {
+                if (item.childCateList)
+                    return { ...item, childCateList: this.getFlagData(item.childCateList, flag) };
+                else return item;
+            });
+            // console.log('arrr-oppp', arr2)
+            return arr2;
+        },
+        getTreeData(data) {
+            if (!Array.isArray(data)) return [];
+            let arr = data.map((item) => {
+                let _item = {};
+                if (item.childCateList) {
+                    if (item.childCateList.length === 0)
+                        _item = { ...item, childCateList: undefined };
+                    else _item = { ...item, childCateList: this.getTreeData(item.childCateList) };
+                } else {
+                    _item = { ...item };
+                }
+                return _item;
+            });
+            return arr;
+        },
+        async handleServiceChange(type, val) {
+            console.log(val);
+            if (val === "social_org") {
+                if (type === "add") await this.getServiceuserList(val);
+                else this.getServiceuserList(val);
+            } else this.getServiceuserList(val);
+        },
 
-      const url = "/governance/icServiceFeedbackV2/add";
-      let params = {
-        ...this.feedbackFormData,
-      };
+        async getServiceuserList(serverOrgType) {
+            if (!serverOrgType) return false;
+            if (this.formData.categoryCode.length === 0) {
+                this.$message.error("请先选择需求类型!");
+                return;
+            }
+            const url = "/actual/base/serviceitem/listServerOrgNewTask";
+            let params = {
+                serverOrgCategoryCode: this.formData.categoryCode[1],
+                serverParentOrgCategoryCode: this.formData.categoryCode[0],
+                serverOrgType: serverOrgType,
+            };
+            let { data, code, msg } = await requestPost(url, params);
+            if (code == 0) {
+                this.serviceOptiondList = data;
+            } else if (code >= 8000) {
+                this.$message.error(msg);
+            }
+        },
 
-      const { data, code, msg ,internalMsg} = await requestPost(url, params);
+        // 获取服务范围树
+        async loadScopeTree() {
+            const url = "/gov/org/icServiceProject/service/serviceScopeTree";
+            // const url = 'http://yapi.elinkservice.cn/mock/245/gov/org/isServiceProject/service/serviceScopeTree'
+            let params = {};
+
+            const { data, code, msg } = await requestPost(url, params);
+
+            if (code === 0) {
+                ++this.iscascaderShow;
+                this.casOptions = [];
+                this.scopeIdArray = [];
+                this.casOptions.push(data);
+            } else {
+                this.$message.error(rspMsg);
+            }
+        },
 
-      if (code === 0) {
-        this.$message.success("反馈成功");
-        this.resetData();
-        this.$emit("handleOk");
-      } else {
-        this.$message.error(internalMsg);
-      }
-    },
-    async addFuwu() {
-      if (this.showFeedback) {
-        this.formData.feedback = { ...this.feedbackFormData };
-      } else {
-        this.formData.feedback = null;
-      }
-      let params = {
-        categoryCode:this.formData.categoryCode[1]?this.formData.categoryCode[1]:'',
-        parentCategoryCode:this.formData.categoryCode[0],
-        resiSearchTagId: this.formData.resiSearchTagId,
-        resiSearchTagName: this.formData.resiSearchTagName,
-        serviceName: this.formData.serviceName,
-        noticeApproches: this.formData.noticeApproches,
-        policyId: this.formData.policyId,
-        serviceOrgType: this.formData.serviceOrgType,
-        serviceOrgId: this.formData.serviceOrgId,
-        objList: this.formData.gridIdList,
-        principalName: this.formData.principalName,
-        principalContact: this.formData.principalContact,
-        serviceTimeStart: this.formData.serviceTimeStart,
-        serviceTimeEnd: this.formData.serviceTimeEnd,
-        remark: this.formData.remark,
-        feedback:this.formData.feedback,
-        serviceRecordId:this.serviceRecordId,
-      };
-      let url = "";
-      if (this.formType != "edit") {
-        url = "/governance/icServiceWarmRecord/searchAdd";
-      } else {
-        url = "/governance/icServiceWarmRecord/searchUpdate";
-        params.attachments = this.formData.attachments
+        handleChangeScope(value) {
+            this.formData.gridIdList = [];
+            let selArray = this.$refs["myCascader"].getCheckedNodes();
+            selArray.forEach((element) => {
+                let obj = {
+                    objectType: element.data.objectType,
+                    objectId: element.data.objectId,
+                    objectName: element.data.objectName,
+                };
+                this.formData.gridIdList.push(obj);
+            });
+        },
 
-      }
-      // const url = 'http://yapi.elinkservice.cn/mock/245/governance/icServiceProject/service/initiate'
+        async handleComfirm() {
+            if (this.formType === "add") {
+                this.handleAdd();
+            } else if (this.formType === "feedback") {
+                this.handleFeedback();
+            } else if (this.formType === "edit") {
+                this.handleAdd();
+            }
+        },
 
-      const { data, code, msg } = await requestPost(url, params);
-      if (code === 0) {
-        this.$message.success("发起成功");
-        this.resetData();
-        this.$emit("handleOk");
-      } else {
-        this.$message.error(msg);
-      }
-    },
+        async handleAdd() {
+            this.btnDisable = true;
+            setTimeout(() => {
+                this.btnDisable = false;
+            }, 10000);
+            this.formData.gridIdList = await this.handleTreeList();
+            this.$refs["ref_form"].validate((valid, messageObj) => {
+                if (!valid) {
+                    app.util.validateRule(messageObj);
+                    this.btnDisable = false;
+                } else {
+                    var oDate1 = new Date(this.formData.serviceTimeStart);
+                    var oDate2 = new Date(this.formData.serviceTimeEnd);
+                    if (oDate1.getTime() > oDate2.getTime()) {
+                        this.$message.error("服务截止时间必须大于服务开始时间");
+                        return false;
+                    }
+                    this.addFuwu();
+                }
+            });
+        },
+        async handleFeedback() {
+            this.btnDisable = true;
+            setTimeout(() => {
+                this.btnDisable = false;
+            }, 10000);
+
+            this.$refs["ref_form_feedback"].validate((valid, messageObj) => {
+                if (!valid) {
+                    app.util.validateRule(messageObj);
+                    this.btnDisable = false;
+                } else {
+                    this.addFeecback();
+                }
+            });
+        },
+        async addFeecback() {
+            // this.feedbackFormData.fileList = [];
+            // this.feedbackFormData.fileList = [...this.fileList];
+            this.feedbackFormData.serviceRecordId = this.serviceRecordId;
+
+            console.log(this.feedbackFormData);
+
+            const url = "/governance/icServiceFeedbackV2/add";
+            let params = {
+                ...this.feedbackFormData,
+            };
+
+            const { data, code, msg, internalMsg } = await requestPost(url, params);
+
+            if (code === 0) {
+                this.$message.success("反馈成功");
+                this.resetData();
+                this.$emit("handleOk");
+            } else {
+                this.$message.error(internalMsg);
+            }
+        },
+        async addFuwu() {
+            if (this.showFeedback) {
+                this.formData.feedback = { ...this.feedbackFormData };
+            } else {
+                this.formData.feedback = null;
+            }
+            let params = {
+                categoryCode: this.formData.categoryCode[1] ? this.formData.categoryCode[1] : '',
+                parentCategoryCode: this.formData.categoryCode[0],
+                resiSearchTagId: this.formData.resiSearchTagId,
+                resiSearchTagName: this.formData.resiSearchTagName,
+                serviceName: this.formData.serviceName,
+                noticeApproches: this.formData.noticeApproches,
+                policyId: this.formData.policyId,
+                serviceOrgType: this.formData.serviceOrgType,
+                serviceOrgId: this.formData.serviceOrgId,
+                objList: this.formData.gridIdList,
+                principalName: this.formData.principalName,
+                principalContact: this.formData.principalContact,
+                serviceTimeStart: this.formData.serviceTimeStart,
+                serviceTimeEnd: this.formData.serviceTimeEnd,
+                serviceStatus: this.formData.serviceStatus,
+                remark: this.formData.remark,
+                feedback: this.formData.feedback,
+                serviceRecordId: this.serviceRecordId,
+            };
+            let url = "";
+            if (this.formType != "edit") {
+                url = "/governance/icServiceWarmRecord/searchAdd";
+            } else {
+                url = "/governance/icServiceWarmRecord/searchUpdate";
+                params.attachments = this.formData.attachments
+
+            }
+            // const url = 'http://yapi.elinkservice.cn/mock/245/governance/icServiceProject/service/initiate'
+
+            const { data, code, msg } = await requestPost(url, params);
+            if (code === 0) {
+                this.$message.success("发起成功");
+                this.resetData();
+                this.$emit("handleOk");
+            } else {
+                this.$message.error(msg);
+            }
+        },
 
-    handleCancle() {
-      this.resetData();
-      this.$emit("handleClose");
-    },
+        handleCancle() {
+            this.resetData();
+            this.$emit("handleClose");
+        },
 
-    resetData() {
-      this.formData = {
-        gridIdList: [], //
-        principalName: "", //经办人(责任人)姓名
-        principalContact: "", //经办人联系方式
-        serviceTimeStart: "", //服务起始时间yyyy-MM-dd
-        serviceTimeEnd: "", //服务截止时间yyyy-MM-dd
-        remark: "", //
-      };
-      this.feedbackFormData = {
-        serviceGoal: "", //	服务目标
-        serviceEffect: "", //	服务效果
-        servicePeopleNumber: null, //	服务人数
-        serviceStatus: "completed", //	服务状态。in_service服务中；completed:已完成
-        satisfaction: "", //满意度。不满意:bad、基本满意:good、非常满意:perfect
-        longitude: "", //	经度
-        latitude: "", //	维度
-        address: "",
-        fileList: [], //	附件列表
-      };
-    },
-    // 开启加载动画
-    startLoading() {
-      loading = Loading.service({
-        lock: true, // 是否锁定
-        text: "正在加载……", // 加载中需要显示的文字
-        background: "rgba(0,0,0,.7)", // 背景颜色
-      });
-    },
-    // 结束加载动画
-    endLoading() {
-      // clearTimeout(timer);
-      if (loading) {
-        loading.close();
-      }
+        resetData() {
+            this.formData = {
+                gridIdList: [], //
+                principalName: "", //经办人(责任人)姓名
+                principalContact: "", //经办人联系方式
+                serviceTimeStart: "", //服务起始时间yyyy-MM-dd
+                serviceTimeEnd: "", //服务截止时间yyyy-MM-dd
+                remark: "", //
+            };
+            this.feedbackFormData = {
+                serviceGoal: "", //	服务目标
+                serviceEffect: "", //	服务效果
+                servicePeopleNumber: null, //	服务人数
+                serviceStatus: "completed", //	服务状态。in_service服务中；completed:已完成
+                satisfaction: "", //满意度。不满意:bad、基本满意:good、非常满意:perfect
+                longitude: "", //	经度
+                latitude: "", //	维度
+                address: "",
+                fileList: [], //	附件列表
+            };
+        },
+        // 开启加载动画
+        startLoading() {
+            loading = Loading.service({
+                lock: true, // 是否锁定
+                text: "正在加载……", // 加载中需要显示的文字
+                background: "rgba(0,0,0,.7)", // 背景颜色
+            });
+        },
+        // 结束加载动画
+        endLoading() {
+            // clearTimeout(timer);
+            if (loading) {
+                loading.close();
+            }
+        },
     },
-  },
 };
 </script>
   
-    <style lang="scss" scoped>
+<style lang="scss" scoped>
 @import "@/assets/scss/modules/management/form-main.scss";
 @import "@/assets/scss/modules/visual/a_customize.scss";
 
 .form-item::v-deep .el-form-item__label {
-  color: #fff;
+    color: #fff;
 }
+
 .form-item {
-  .el-radio {
-    color: #fff;
-  }
+    .el-radio {
+        color: #fff;
+    }
 
-  .el-checkbox {
-    color: #fff;
-  }
+    .el-checkbox {
+        color: #fff;
+    }
 }
 </style>
   
diff --git a/src/views/modules/communityService/wennuanzhaoren/editForm.vue b/src/views/modules/communityService/wennuanzhaoren/editForm.vue
index 87b2deb29..c668309bc 100644
--- a/src/views/modules/communityService/wennuanzhaoren/editForm.vue
+++ b/src/views/modules/communityService/wennuanzhaoren/editForm.vue
@@ -14,7 +14,7 @@
                         style="display: block">
             <span>{{formData.serviceName}}</span>
             <!-- <el-select class="item_width_1"
-                       v-model="formData.serviceProjectId"
+                       v-model.trim="formData.serviceProjectId"
                        placeholder="请选择"
                        filterable
                        clearable>
@@ -33,7 +33,7 @@
                         style="display: block">
             <span>{{serviceOrgName}}</span>
             <!-- <el-select class="item_width_1"
-                       v-model="formData.serviceOrgId"
+                       v-model.trim="formData.serviceOrgId"
                        placeholder="请选择"
                        filterable
                        clearable>
@@ -56,7 +56,7 @@
             </div>
             <!-- <el-cascader class="item_width_1"
                          ref="myCascader"
-                         v-model="scopeIdArray"
+                         v-model.trim="scopeIdArray"
                          :key="iscascaderShow"
                          :options="casOptions"
                          :props="optionProps"
@@ -69,7 +69,7 @@
                         label-width="150px"
                         style="display: block">
             <el-select :disabled="formType==='detail'"
-                       v-model="formData.policyId"
+                       v-model.trim="formData.policyId"
                        class="input-width-small"
                        placeholder="请选择"
                        clearable>
@@ -93,7 +93,7 @@
             <el-input :disabled="formType==='detail'"
                       class="item_width_1"
                       placeholder="请输入经办人姓名"
-                      v-model="formData.principalName">
+                      v-model.trim="formData.principalName">
             </el-input>
           </el-form-item>
           <el-form-item label="联系方式"
@@ -103,11 +103,11 @@
             <el-input :disabled="formType==='detail'"
                       class="item_width_1"
                       placeholder="请输入联系方式"
-                      v-model="formData.principalContact">
+                      v-model.trim="formData.principalContact">
             </el-input>
           </el-form-item>
           <el-form-item label="指派服务" label-width="150px">
-             <el-switch v-model="assignSwitch"> </el-switch>
+             <el-switch v-model.trim="assignSwitch"> </el-switch>
            </el-form-item>
 
             <el-form-item
@@ -117,7 +117,7 @@
             style="display: block"
             v-show="this.assignSwitch"
              >
-             <input type="text" v-model="formData.resiSearchTagId" v-show="false">
+             <input type="text" v-model.trim="formData.resiSearchTagId" v-show="false">
               <template  v-if="this.resiSearchTagName">
                 <el-tag   @close="handleCloseTag"  closable style="margin-right:10px;">
                 {{this.resiSearchTagName }}
@@ -133,7 +133,7 @@
                         prop="serviceTimeStart"
                         style="display: block">
             <el-date-picker :disabled="formType==='detail'"
-                            v-model="formData.serviceTimeStart"
+                            v-model.trim="formData.serviceTimeStart"
                             :picker-options="startPickerOptions"
                             class="item_width_2"
                             type="date"
@@ -143,7 +143,7 @@
             </el-date-picker>
             <span class="u-data-tag">至</span>
             <el-date-picker :disabled="formType==='detail'"
-                            v-model="formData.serviceTimeEnd"
+                            v-model.trim="formData.serviceTimeEnd"
                             :picker-options="endPickerOptions"
                             class="item_width_2 u-data-tag"
                             type="date"
@@ -164,7 +164,7 @@
                       show-word-limit
                       :rows="3"
                       placeholder="请输入备注，不超过500字"
-                      v-model="formData.remark"></el-input>
+                      v-model.trim="formData.remark"></el-input>
           </el-form-item>
 
         </el-form>
@@ -188,7 +188,7 @@
                         show-word-limit
                         :rows="3"
                         placeholder="请输入服务目标，不超过1000字"
-                        v-model="feedbackFormData.serviceGoal"></el-input>
+                        v-model.trim="feedbackFormData.serviceGoal"></el-input>
             </el-form-item>
 
             <el-form-item label="服务效果"
@@ -201,7 +201,7 @@
                         show-word-limit
                         :rows="3"
                         placeholder="请输入服务效果，不超过1000字"
-                        v-model="feedbackFormData.serviceEffect"></el-input>
+                        v-model.trim="feedbackFormData.serviceEffect"></el-input>
             </el-form-item>
 
             <el-form-item label="服务人数"
@@ -209,7 +209,7 @@
                           prop="servicePeopleNumber"
                           label-width="150px">
               <el-input-number class="item_width_2"
-                               v-model="feedbackFormData.servicePeopleNumber"
+                               v-model.trim="feedbackFormData.servicePeopleNumber"
                                :min="0"
                                :max="9999"
                                label="服务人数"></el-input-number>
@@ -221,7 +221,7 @@
                           prop="serviceStatus">
               <span>已完成</span>
               <!-- <el-select class="item_width_1"
-                         v-model="feedbackFormData.serviceStatus"
+                         v-model.trim="feedbackFormData.serviceStatus"
                          placeholder="全部"
                          clearable>
                 <el-option v-for="item in statusArray"
@@ -237,7 +237,7 @@
                           label-width="150px"
                           prop="satisfaction">
               <el-select class="item_width_2"
-                         v-model="feedbackFormData.satisfaction"
+                         v-model.trim="feedbackFormData.satisfaction"
                          placeholder="全部"
                          clearable>
                 <el-option v-for="item in satisfyArray"
@@ -253,7 +253,7 @@
                           label-width="150px"
                           style="display: block">
               <el-input class="item_width_1"
-                        v-model="feedbackFormData.address"></el-input>
+                        v-model.trim="feedbackFormData.address"></el-input>
             </el-form-item>
             <!-- <el-form-item label="地图位置"
                           label-width="150px"
@@ -268,7 +268,7 @@
                     <el-input maxlength="50"
                               size="mini"
                               placeholder="请输入关键字"
-                              v-model="keyWords">
+                              v-model.trim="keyWords">
                     </el-input>
                     <el-button style="margin-left: 10px"
                                type="primary"
diff --git a/src/views/modules/communityService/wennuanzhaoren/index.vue b/src/views/modules/communityService/wennuanzhaoren/index.vue
index 9227e1b78..74bb53336 100644
--- a/src/views/modules/communityService/wennuanzhaoren/index.vue
+++ b/src/views/modules/communityService/wennuanzhaoren/index.vue
@@ -8,7 +8,7 @@
                  :label-width="'100px'">
                  <el-form-item label="服务类别" prop="categoryCode">
                     <el-cascader
-                      v-model="formData.categoryCode"
+                      v-model.trim="formData.categoryCode"
                       class="u-item-width-daterange2"
                       size="small"
                       :options="searchdemandOptions"
@@ -20,7 +20,7 @@
 
             <el-form-item label="服务时间"
                           prop="serviceTimeStart">
-              <el-date-picker v-model="formData.serviceTimeStart"
+              <el-date-picker v-model.trim="formData.serviceTimeStart"
                               :picker-options="startPickerOptions"
                               class="u-item-width-daterange"
                               size="small"
@@ -30,7 +30,7 @@
                               placeholder="开始时间">
               </el-date-picker>
               <span class="u-data-tag">至</span>
-              <el-date-picker v-model="formData.serviceTimeEnd"
+              <el-date-picker v-model.trim="formData.serviceTimeEnd"
                               :picker-options="endPickerOptions"
                               class="u-item-width-daterange u-data-tag"
                               size="small"
@@ -44,7 +44,7 @@
 
             <el-form-item label="服务事项"
                           prop="serviceName">
-              <el-input v-model="formData.serviceName"
+              <el-input v-model.trim="formData.serviceName"
                         class="u-item-width-normal"
                         size="small"
                         clearable
@@ -54,7 +54,7 @@
 
             <el-form-item label="服务组织"
                           prop="serviceOrgType">
-              <el-select v-model="formData.serviceOrgType"
+              <el-select v-model.trim="formData.serviceOrgType"
                          class="u-item-width-daterange"
                          placeholder="请选择"
                          size="small"
@@ -66,7 +66,7 @@
                            :value="item.value">
                 </el-option>
               </el-select>
-              <el-select v-model="formData.serviceOrgId"
+              <el-select v-model.trim="formData.serviceOrgId"
                          class="u-item-width-daterange u-data-tag"
                          filterable
                          placeholder="请选择"
@@ -85,7 +85,7 @@
             <el-form-item label="服务状态"
                           prop="serviceStatus">
               <el-select class="u-item-width-normal"
-                         v-model="formData.serviceStatus"
+                         v-model.trim="formData.serviceStatus"
                          placeholder="全部"
                          size="small"
                          clearable>
@@ -100,7 +100,7 @@
             <el-form-item label="满意度"
                           prop="satisfaction">
               <el-select class="u-item-width-normal"
-                         v-model="formData.satisfaction"
+                         v-model.trim="formData.satisfaction"
                          placeholder="全部"
                          size="small"
                          clearable>
diff --git a/src/views/modules/communityService/wennuanzhaoren/personList.vue b/src/views/modules/communityService/wennuanzhaoren/personList.vue
index 854160ea8..4977bd19f 100644
--- a/src/views/modules/communityService/wennuanzhaoren/personList.vue
+++ b/src/views/modules/communityService/wennuanzhaoren/personList.vue
@@ -19,7 +19,7 @@
         </el-form-item>
         <el-form-item label="人员姓名" prop="title">
           <el-input
-              v-model="searchFormData.name"
+              v-model.trim="searchFormData.name"
               class="u-item-width-normal"
               size="small"
               clearable
@@ -29,7 +29,7 @@
 
         <el-form-item label="手机号" prop="title">
           <el-input
-              v-model="searchFormData.mobile"
+              v-model.trim="searchFormData.mobile"
               class="u-item-width-normal"
               size="small"
               clearable
@@ -39,7 +39,7 @@
 
         <el-form-item label="身份证号" prop="title">
           <el-input
-              v-model="searchFormData.idCard"
+              v-model.trim="searchFormData.idCard"
               class="u-item-width-normal"
               size="small"
               clearable
@@ -49,7 +49,7 @@
 
         <el-form-item label="享受服务次数" prop="title">
           <el-input
-              v-model="searchFormData.serveTimes"
+              v-model.trim="searchFormData.serveTimes"
               class="u-item-width-normal"
               size="small"
               clearable
@@ -58,7 +58,7 @@
         </el-form-item>
 
         <el-form-item label="家庭住址" prop="title">
-          <el-select v-model="searchFormData.villageId" placeholder="请选择小区"
+          <el-select v-model.trim="searchFormData.villageId" placeholder="请选择小区"
                      @change="handleQuarterSelectorsChange" clearable>
             <el-option
                 v-for="item in quartersSelectItems"
@@ -67,7 +67,7 @@
                 :value="item.value">
             </el-option>
           </el-select>
-          <el-select v-model="searchFormData.buildId" placeholder="请选择楼栋"
+          <el-select v-model.trim="searchFormData.buildId" placeholder="请选择楼栋"
                      @change="handleBuildSelectorsChange" clearable>
             <el-option
                 v-for="item in buildingSelectItems"
@@ -76,7 +76,7 @@
                 :value="item.value">
             </el-option>
           </el-select>
-          <el-select v-model="searchFormData.unitId" placeholder="请选择单元"
+          <el-select v-model.trim="searchFormData.unitId" placeholder="请选择单元"
                      @change="handleUnitSelectorsChange" clearable>
             <el-option
                 v-for="item in unitSelectItems"
@@ -85,7 +85,7 @@
                 :value="item.value">
             </el-option>
           </el-select>
-          <el-select v-model="searchFormData.homeId" placeholder="请选择房屋"
+          <el-select v-model.trim="searchFormData.homeId" placeholder="请选择房屋"
                      @change="handleUnitSelectorsChange" clearable>
             <el-option
                 v-for="item in homeSelectItems"
diff --git a/src/views/modules/communityService/worklog/workLog.vue b/src/views/modules/communityService/worklog/workLog.vue
index 35bbe906e..78947e14f 100644
--- a/src/views/modules/communityService/worklog/workLog.vue
+++ b/src/views/modules/communityService/worklog/workLog.vue
@@ -8,7 +8,7 @@
         <div>
           <el-form-item label="所属网格"
                         prop="gridId">
-            <el-select v-model="workLog.gridId"
+            <el-select v-model.trim="workLog.gridId"
                        filterable
                        size="small"
                        placeholder="请选择"
@@ -22,7 +22,7 @@
           </el-form-item>
           <el-form-item label="服务类型"
                         prop="serviceType">
-            <el-select v-model="workLog.serviceType"
+            <el-select v-model.trim="workLog.serviceType"
                        filterable
                        size="small"
                        placeholder="请选择"
@@ -36,7 +36,7 @@
           </el-form-item>
           <el-form-item label="申请人"
                         prop="applicantName">
-            <el-input v-model="workLog.applicantName"
+            <el-input v-model.trim="workLog.applicantName"
                       class="item_width_1"
                       clearable
                       size="small"
@@ -45,7 +45,7 @@
           </el-form-item>
           <el-form-item label="住址"
                         prop="applicantAddress">
-            <el-input v-model="workLog.applicantAddress"
+            <el-input v-model.trim="workLog.applicantAddress"
                       class="item_width_1"
                       clearable
                       size="small"
@@ -56,7 +56,7 @@
         <div>
           <el-form-item label="服务内容"
                         prop="serviceContent">
-            <el-input v-model="workLog.serviceContent"
+            <el-input v-model.trim="workLog.serviceContent"
                       class="item_width_1"
                       clearable
                       size="small"
@@ -65,7 +65,7 @@
           </el-form-item>
           <el-form-item label="联系电话"
                         prop="applicantMobile">
-            <el-input v-model="workLog.applicantMobile"
+            <el-input v-model.trim="workLog.applicantMobile"
                       class="item_width_1"
                       clearable
                       size="small"
@@ -74,7 +74,7 @@
           </el-form-item>
           <el-form-item label="服务时间"
                         prop="serviceTimeArea">
-            <el-date-picker v-model="serviceTimeArea"
+            <el-date-picker v-model.trim="serviceTimeArea"
                             clearable
                             type="daterange"
                             format="yyyy-MM-dd"
diff --git a/src/views/modules/communityService/worklog/workLogForm.vue b/src/views/modules/communityService/worklog/workLogForm.vue
index 0920d3e60..abe85cf06 100644
--- a/src/views/modules/communityService/worklog/workLogForm.vue
+++ b/src/views/modules/communityService/worklog/workLogForm.vue
@@ -13,7 +13,7 @@
                       label-width="150px"
                       style="display: block"
                       prop="gridId">
-          <el-select v-model="formData.gridId"
+          <el-select v-model.trim="formData.gridId"
                      filterable
                      placeholder="请选择"
                      @change="handleGridChange"
@@ -30,7 +30,7 @@
                       label-width="150px"
                       style="display: block"
                       prop="serviceType">
-          <el-select v-model="formData.serviceType" filterable placeholder="请选择"
+          <el-select v-model.trim="formData.serviceType" filterable placeholder="请选择"
                      clearable>
             <el-option v-for="item in serviceTypeList"
                        :key="item.serviceType"
@@ -44,7 +44,7 @@
                       label-width="150px"
                       style="display: block"
                       prop="applicantId">
-          <el-select v-model="formData.applicantId"
+          <el-select v-model.trim="formData.applicantId"
                      filterable
                      placeholder="请选择"
                      @change="handleUserChange"
@@ -61,7 +61,7 @@
                       style="display: block"
                       label-width="150px"
                       prop="applicantAddress">
-          <el-input v-model="formData.applicantAddress"
+          <el-input v-model.trim="formData.applicantAddress"
                     class="item_width_1"
                     placeholder="请输入住址"></el-input>
         </el-form-item>
@@ -69,7 +69,7 @@
                       style="display: block"
                       label-width="150px"
                       prop="serviceContent">
-          <el-input v-model="formData.serviceContent"
+          <el-input v-model.trim="formData.serviceContent"
                     class="item_width_1"
                     type="textarea"
                     placeholder="请输入服务内容"></el-input>
@@ -79,7 +79,7 @@
                       style="display: block"
                       label-width="150px"
                       prop="applicantMobile">
-          <el-input v-model="formData.applicantMobile"
+          <el-input v-model.trim="formData.applicantMobile"
                     class="item_width_1"
                     placeholder="请输入联系电话"></el-input>
         </el-form-item>
@@ -88,7 +88,7 @@
                       style="display: block"
                       label-width="150px"
                       prop="principalName">
-          <el-input v-model="formData.principalName"
+          <el-input v-model.trim="formData.principalName"
                     class="item_width_1"
                     placeholder="请输入负责人"></el-input>
         </el-form-item>
@@ -97,7 +97,7 @@
                       style="display: block"
                       label-width="150px"
                       prop="serviceTime">
-          <el-date-picker v-model="formData.serviceTime"
+          <el-date-picker v-model.trim="formData.serviceTime"
                           type="date"
                           class="input-width"
                           clearable
@@ -110,7 +110,7 @@
                       style="display: block"
                       label-width="150px"
                       prop="remark">
-          <el-input v-model="formData.remark"
+          <el-input v-model.trim="formData.remark"
                     class="item_width_1"
                     type="textarea"
                     placeholder="请输入备注"></el-input>
diff --git a/src/views/modules/cpts/base/cpts/edit.vue b/src/views/modules/cpts/base/cpts/edit.vue
index e3ebd02fb..3dd9066e1 100644
--- a/src/views/modules/cpts/base/cpts/edit.vue
+++ b/src/views/modules/cpts/base/cpts/edit.vue
@@ -23,7 +23,7 @@
           >
             <template v-if="item.type == 'switch'">
               <el-switch
-                v-model="fmData[item.keyName]"
+                v-model.trim="fmData[item.keyName]"
                 size="small"
                 :active-text="item.activeText || ''"
                 :inactive-text="item.inactiveText || ''"
@@ -38,7 +38,7 @@
                 v-if="
                   formType == 'add' || (formType == 'edit' && !item.editDisable)
                 "
-                v-model="fmData[item.keyName]"
+                v-model.trim="fmData[item.keyName]"
                 class="item-input"
                 size="small"
                 clearable
@@ -59,7 +59,7 @@
                 v-if="
                   formType == 'add' || (formType == 'edit' && !item.editDisable)
                 "
-                v-model="fmData[item.keyName]"
+                v-model.trim="fmData[item.keyName]"
                 type="textarea"
                 class="item-input"
                 size="small"
@@ -81,7 +81,7 @@
                 v-if="
                   formType == 'add' || (formType == 'edit' && !item.editDisable)
                 "
-                v-model="fmData[item.keyName]"
+                v-model.trim="fmData[item.keyName]"
                 :picker-options="item.pickerOptions"
                 class="item-input"
                 size="small"
@@ -102,7 +102,7 @@
                 v-if="
                   formType == 'add' || (formType == 'edit' && !item.editDisable)
                 "
-                v-model="fmData[item.keyName]"
+                v-model.trim="fmData[item.keyName]"
                 class="item-number"
                 size="small"
                 clearable
@@ -121,7 +121,7 @@
 
             <template v-else-if="item.type == 'select'">
               <el-select
-                v-model="fmData[item.keyName]"
+                v-model.trim="fmData[item.keyName]"
                 :placeholder="item.placeholder || '请选择'"
                 size="small"
                 clearable
@@ -169,7 +169,7 @@
               >
                 <Tinymce
                   :ref="'richText' + item.keyName"
-                  v-model="fmData[item.keyName]"
+                  v-model.trim="fmData[item.keyName]"
                   :customerId="customerId"
                   :placeholder="item.placeholder || '请输入'"
                   :height="500"
@@ -186,7 +186,7 @@
 
             <template v-else-if="item.type == 'cascader'">
               <el-cascader
-                v-model="fmData[item.keyName]"
+                v-model.trim="fmData[item.keyName]"
                 :placeholder="item.placeholder || '请选择'"
                 :options="item.optionList"
                 :props="item.optionProps || {}"
@@ -237,7 +237,7 @@
               <div class="address-item">
                 <!-- <el-input class="address-item-input"
                           :placeholder="item.placeholder || '请输入所在地址'"
-                          v-model="fmData[item.keyName]"
+                          v-model.trim="fmData[item.keyName]"
                           :maxlength="item.maxlength || ''"
                           show-word-limit
                           size="small">
@@ -248,7 +248,7 @@
                            ref="mapSearch"
                            @click="handleSearchMap(item)">查询</el-button> -->
                 <el-select
-                  v-model="searchAddressKeyword"
+                  v-model.trim="searchAddressKeyword"
                   filterable
                   class="item-input"
                   remote
@@ -273,7 +273,7 @@
                     class="address-item-input2"
                     maxlength="50"
                     placeholder="请输入经度"
-                    v-model="fmData[item.supKeys[0]]"
+                    v-model.trim="fmData[item.supKeys[0]]"
                   >
                   </el-input>
                   <span style="margin-left: 20px">纬度</span>
@@ -281,7 +281,7 @@
                     class="address-item-input2"
                     maxlength="50"
                     placeholder="请输入纬度"
-                    v-model="fmData[item.supKeys[1]]"
+                    v-model.trim="fmData[item.supKeys[1]]"
                   >
                   </el-input>
                 </div>
@@ -291,7 +291,7 @@
                 v-if="
                   formType == 'add' || (formType == 'edit' && !item.editDisable)
                 "
-                v-model="fmData[item.keyName]"
+                v-model.trim="fmData[item.keyName]"
                 class="item-input"
                 size="small"
                 clearable
diff --git a/src/views/modules/cpts/base/index.vue b/src/views/modules/cpts/base/index.vue
index 269041c4c..cc06b3bcd 100644
--- a/src/views/modules/cpts/base/index.vue
+++ b/src/views/modules/cpts/base/index.vue
@@ -17,7 +17,7 @@
                           :label="item.field"
                           :prop="item.keyName">
               <template v-if="item.type == 'input'">
-                <el-input v-model="item.value"
+                <el-input v-model.trim="item.value"
                           class="u-item-width-normal"
                           size="small"
                           clearable
@@ -25,7 +25,7 @@
                 </el-input>
               </template>
               <template v-else-if="item.type == 'select'">
-                <el-select v-model="item.value"
+                <el-select v-model.trim="item.value"
                            :placeholder="item.placeholder || '请选择'"
                            size="small"
                            class="u-item-width-normal"
@@ -40,7 +40,7 @@
               </template>
               
               <template v-else-if="item.type == 'cascader'">
-                <el-cascader v-model="item.value"
+                <el-cascader v-model.trim="item.value"
                              :placeholder="item.placeholder || '请选择'"
                              :options="item.optionList"
                              :props="item.optionProps"
@@ -52,7 +52,7 @@
                 </el-cascader>
               </template>
               <template v-if="item.type == 'date-range'">
-                <el-date-picker v-model="item.supValues[0]"
+                <el-date-picker v-model.trim="item.supValues[0]"
                                 type="date"
                                 placeholder="开始时间"
                                 value-format="yyyy-MM-dd"
@@ -60,7 +60,7 @@
                                 clearable>
                 </el-date-picker>
                 <span class="u-data-tag">至</span>
-                <el-date-picker v-model="item.supValues[1]"
+                <el-date-picker v-model.trim="item.supValues[1]"
                                 class="u-item-width-daterange u-data-tag"
                                 type="date"
                                 placeholder="结束时间"
diff --git a/src/views/modules/cpts/base2/cpts/edit.vue b/src/views/modules/cpts/base2/cpts/edit.vue
index c6bfa599c..8571abb24 100644
--- a/src/views/modules/cpts/base2/cpts/edit.vue
+++ b/src/views/modules/cpts/base2/cpts/edit.vue
@@ -30,7 +30,7 @@
           >
             <template v-if="item.type == 'switch'">
               <el-switch
-                v-model="fmData[item.keyName]"
+                v-model.trim="fmData[item.keyName]"
                 size="small"
                 :active-text="item.activeText || ''"
                 :inactive-text="item.inactiveText || ''"
@@ -45,7 +45,7 @@
                 v-if="
                   formType == 'add' || (formType == 'edit' && !item.editDisable)
                 "
-                v-model="fmData[item.keyName]"
+                v-model.trim="fmData[item.keyName]"
                 class="item-input"
                 size="small"
                 clearable
@@ -66,7 +66,7 @@
                 v-if="
                   formType == 'add' || (formType == 'edit' && !item.editDisable)
                 "
-                v-model="fmData[item.keyName]"
+                v-model.trim="fmData[item.keyName]"
                 type="textarea"
                 class="item-input"
                 size="small"
@@ -88,7 +88,7 @@
                 v-if="
                   formType == 'add' || (formType == 'edit' && !item.editDisable)
                 "
-                v-model="fmData[item.keyName]"
+                v-model.trim="fmData[item.keyName]"
                 :picker-options="item.pickerOptions"
                 class="item-input"
                 size="small"
@@ -109,7 +109,7 @@
                 v-if="
                   formType == 'add' || (formType == 'edit' && !item.editDisable)
                 "
-                v-model="fmData[item.keyName]"
+                v-model.trim="fmData[item.keyName]"
                 class="item-number"
                 size="small"
                 clearable
@@ -128,7 +128,7 @@
 
             <template v-else-if="item.type == 'select'">
               <el-select
-                v-model="fmData[item.keyName]"
+                v-model.trim="fmData[item.keyName]"
                 :placeholder="item.placeholder || '请选择'"
                 size="small"
                 clearable
@@ -176,7 +176,7 @@
               >
                 <Tinymce
                   :ref="'richText' + item.keyName"
-                  v-model="fmData[item.keyName]"
+                  v-model.trim="fmData[item.keyName]"
                   :customerId="customerId"
                   :placeholder="item.placeholder || '请输入'"
                   :height="500"
@@ -193,7 +193,7 @@
 
             <template v-else-if="item.type == 'cascader'">
               <el-cascader
-                v-model="fmData[item.keyName]"
+                v-model.trim="fmData[item.keyName]"
                 :placeholder="item.placeholder || '请选择'"
                 :options="item.optionList"
                 :props="item.optionProps || {}"
@@ -246,7 +246,7 @@
               <div class="address-item">
                 <!-- <el-input class="address-item-input"
                           :placeholder="item.placeholder || '请输入所在地址'"
-                          v-model="fmData[item.keyName]"
+                          v-model.trim="fmData[item.keyName]"
                           :maxlength="item.maxlength || ''"
                           show-word-limit
                           size="small">
@@ -261,7 +261,7 @@
                     formType == 'add' ||
                     (formType == 'edit' && !item.editDisable)
                   "
-                  v-model="searchAddressKeyword || fmData.location"
+                  v-model.trim="searchAddressKeyword || fmData.location"
                   filterable
                   class="item-input"
                   size="small"
@@ -287,7 +287,7 @@
                 <el-input
                   v-if="formType == 'add' || formType == 'edit'"
                   v-show="false"
-                  v-model="fmData[item.keyName]"
+                  v-model.trim="fmData[item.keyName]"
                   class="item-input"
                   size="small"
                   clearable
diff --git a/src/views/modules/cpts/base2/index.vue b/src/views/modules/cpts/base2/index.vue
index e64fd9ebf..44a5380ac 100644
--- a/src/views/modules/cpts/base2/index.vue
+++ b/src/views/modules/cpts/base2/index.vue
@@ -12,7 +12,7 @@
             >
               <template v-if="item.type == 'input'">
                 <el-input
-                  v-model="item.value"
+                  v-model.trim="item.value"
                   size="small"
                   class="u-item-width-normal"
                   clearable
@@ -22,7 +22,7 @@
               </template>
               <template v-else-if="item.type == 'select'">
                 <el-select
-                  v-model="item.value"
+                  v-model.trim="item.value"
                   :placeholder="item.placeholder || '请选择'"
                   size="small"
                   clearable
@@ -40,7 +40,7 @@
               </template>
               <template v-else-if="item.type == 'cascader'">
                 <el-cascader
-                  v-model="item.value"
+                  v-model.trim="item.value"
                   :placeholder="item.placeholder || '请选择'"
                   :options="item.optionList"
                   :props="item.optionProps"
@@ -54,7 +54,7 @@
               </template>
               <template v-if="item.type == 'date-range'">
                 <el-date-picker
-                  v-model="item.supValues[0]"
+                  v-model.trim="item.supValues[0]"
                   type="date"
                   placeholder="开始时间"
                   style="width: 150px"
@@ -64,7 +64,7 @@
                 </el-date-picker>
                 <span style="display: inline-block; margin: 0 10px">至</span>
                 <el-date-picker
-                  v-model="item.supValues[1]"
+                  v-model.trim="item.supValues[1]"
                   type="date"
                   placeholder="结束时间"
                   style="width: 150px"
@@ -75,7 +75,7 @@
               </template>
               <template v-if="item.type == 'date'">
                 <el-date-picker
-                  v-model="item.value"
+                  v-model.trim="item.value"
                   type="date"
                   size="small"
                   placeholder=""
diff --git a/src/views/modules/customer/customize/CategoryEdit.vue b/src/views/modules/customer/customize/CategoryEdit.vue
index e522957af..eabf2f7e7 100644
--- a/src/views/modules/customer/customize/CategoryEdit.vue
+++ b/src/views/modules/customer/customize/CategoryEdit.vue
@@ -21,13 +21,13 @@
             <el-input class="item_width_1"
                       :maxlength="20"
                       :minlength="2"
-                      v-model="dataForm.categoryName"
+                      v-model.trim="dataForm.categoryName"
                       placeholder="分类名称"></el-input>
           </el-tooltip>
         </el-form-item>
         <el-form-item label="排序"
                       prop="sort">
-          <el-input-number v-model="dataForm.sort"
+          <el-input-number v-model.trim="dataForm.sort"
                            :min="1"
                            label="描述文字"></el-input-number>
         </el-form-item>
diff --git a/src/views/modules/customer/customize/CategoryList.vue b/src/views/modules/customer/customize/CategoryList.vue
index 3756ad459..78566e15f 100644
--- a/src/views/modules/customer/customize/CategoryList.vue
+++ b/src/views/modules/customer/customize/CategoryList.vue
@@ -9,7 +9,7 @@
         <!-- <el-button class=""
                    type="primary"
                    @click="addShow()">{{"新增" }}</el-button> -->
-        <!-- <el-input v-model="search"
+        <!-- <el-input v-model.trim="search"
                   placeholder="请输入内容"></el-input> -->
       </div>
       <el-table v-loading="dataListLoading"
diff --git a/src/views/modules/customer/customize/ConfigEdit.vue b/src/views/modules/customer/customize/ConfigEdit.vue
index a12fc4ba5..2575468ae 100644
--- a/src/views/modules/customer/customize/ConfigEdit.vue
+++ b/src/views/modules/customer/customize/ConfigEdit.vue
@@ -26,7 +26,7 @@
             <el-input class="item_width_1"
                       :maxlength="5"
                       :minlength="2"
-                      v-model="dataForm.functionName"
+                      v-model.trim="dataForm.functionName"
                       placeholder="功能名称"></el-input>
           </el-tooltip>
         </el-form-item>
@@ -38,7 +38,7 @@
                       class="block"
                       prop="targetLink">
           <el-input style="width:400px;display:block;margin-bottom:10px; float:left"
-                    v-model="dataForm.targetLink"
+                    v-model.trim="dataForm.targetLink"
                     placeholder="外链地址"></el-input>
 
         </el-form-item>
@@ -55,7 +55,7 @@
             <el-input v-if="dataForm.isDomainName==='1'"
                       style="width:400px;display:block;margin-bottom:10px; float:left"
                       placeholder='请输入业务域名'
-                      v-model="dataForm.domainName"> </el-input>
+                      v-model.trim="dataForm.domainName"> </el-input>
 
             <span style="width:400px;display:block;margin-bottom:10px; float:left"
                   v-else>无</span>
diff --git a/src/views/modules/customer/customize/ConfigItem.vue b/src/views/modules/customer/customize/ConfigItem.vue
index c92959f53..97ee3b3eb 100644
--- a/src/views/modules/customer/customize/ConfigItem.vue
+++ b/src/views/modules/customer/customize/ConfigItem.vue
@@ -12,7 +12,7 @@
                  @click="setDomainName">设置业务域名</el-button>
 
     </div>
-    <el-tabs v-model="activeName"
+    <el-tabs v-model.trim="activeName"
              @tab-click="tabChange"
              class="el-tabs">
       <el-tab-pane label="居民端"
@@ -373,11 +373,11 @@
 
               <el-checkbox style="width:'500px'"
                            :indeterminate="isIndeterminate"
-                           v-model="checkAll"
+                           v-model.trim="checkAll"
                            @change="handleCheckAllChange">全选</el-checkbox>
 
               <el-checkbox-group style="width:'500px'"
-                                 v-model="roleCheckedArray"
+                                 v-model.trim="roleCheckedArray"
                                  @change="handleCheckedCitiesChange">
                 <el-checkbox v-for="item in roleAllList"
                              :label="item.roleKey"
@@ -395,7 +395,7 @@
                       resize="none"
                       style="width:400px"
                       placeholder='请输入理由'
-                      v-model="upOrDownForm.reason">
+                      v-model.trim="upOrDownForm.reason">
             </el-input>
 
           </el-form-item>
diff --git a/src/views/modules/customer/customize/CustomerList.vue b/src/views/modules/customer/customize/CustomerList.vue
index 3057a2318..51476723e 100644
--- a/src/views/modules/customer/customize/CustomerList.vue
+++ b/src/views/modules/customer/customize/CustomerList.vue
@@ -6,7 +6,7 @@
            class="mod-/oper/customize__homecomponent}">
         <el-form :inline="true">
           <el-form-item>
-            <el-input v-model="ruleForm.name"
+            <el-input v-model.trim="ruleForm.name"
                       placeholder="请输入客户名称"
                       :clearable="true"></el-input>
           </el-form-item>
diff --git a/src/views/modules/customer/customize/MiniHome.vue b/src/views/modules/customer/customize/MiniHome.vue
index 6313d3cd0..037183234 100644
--- a/src/views/modules/customer/customize/MiniHome.vue
+++ b/src/views/modules/customer/customize/MiniHome.vue
@@ -157,7 +157,7 @@
                        ref="form">
                 <el-form-item>
                   <el-input type="textarea"
-                            v-model="focusedCpt.demoData"></el-input>
+                            v-model.trim="focusedCpt.demoData"></el-input>
                 </el-form-item>
               </el-form> -->
 
@@ -173,7 +173,7 @@
               <el-form ref="form">
                 <el-form-item>
                   <el-input type="textarea"
-                            v-model="focusedCpt.configuration"></el-input>
+                            v-model.trim="focusedCpt.configuration"></el-input>
                 </el-form-item>
                 <div class="d-config-hint"
                      v-show="focusedCpt.configurationDescription">
diff --git a/src/views/modules/customer/customize/MostList.vue b/src/views/modules/customer/customize/MostList.vue
index 27fa85dbc..b60123079 100644
--- a/src/views/modules/customer/customize/MostList.vue
+++ b/src/views/modules/customer/customize/MostList.vue
@@ -17,7 +17,7 @@
     </el-tag>
     <div class="mh-child">
       <el-tag class="set-overtime">项目外部系统流转：</el-tag>
-      <el-switch v-model="sendProjectSwitch"
+      <el-switch v-model.trim="sendProjectSwitch"
                  active-text="开启"
                  inactive-text="关闭"
                  element
@@ -46,7 +46,7 @@
     </div>
     <div class="mh-child">
       <el-tag class="set-overtime">外部系统：</el-tag>
-      <el-select v-model="sysOptions"
+      <el-select v-model.trim="sysOptions"
                  multiple
                  placeholder="请选择"
                  @remove-tag="handlesysTag"
@@ -88,7 +88,7 @@
         <el-time-picker class="overtime-input"
                         arrow-control
                         prefix-icon="el-icon-date"
-                        v-model="remindForm.startTime"
+                        v-model.trim="remindForm.startTime"
                         :picker-options="{
             selectableRange: '00:00:00' + '-' + '23:59:59'
           }"
@@ -99,7 +99,7 @@
         <el-time-picker class="overtime-input"
                         arrow-control
                         prefix-icon="el-icon-date"
-                        v-model="remindForm.endTime"
+                        v-model.trim="remindForm.endTime"
                         :picker-options="{
             selectableRange: remindForm.startTime + '-' + '23:59:59'
           }"
@@ -111,9 +111,9 @@
                     label="设定滞留超期时间："
                     prop="detentionDays">
         <el-input-number class="overtime-input"
-                         v-model="remindForm.detentionDays"></el-input-number>
+                         v-model.trim="remindForm.detentionDays"></el-input-number>
         <span style="padding: 25px">/</span>
-        <el-select v-model="remindForm.calculation"
+        <el-select v-model.trim="remindForm.calculation"
                    placeholder="请选择"
                    class="overtime-input">
           <el-option v-for="item in options"
@@ -129,7 +129,7 @@
                     label="设定即将超期时间提醒："
                     prop="remindTime">
         <el-input-number class="overtime-input"
-                         v-model="remindForm.remindTime"></el-input-number>
+                         v-model.trim="remindForm.remindTime"></el-input-number>
         <span style="padding: 25px">单位天</span>
       </el-form-item>
       <!-- 统一定时消息推送时间 -->
@@ -137,7 +137,7 @@
                     label="统一定时消息推送时间："
                     prop="pushTime">
         <el-time-select class="overtime-input"
-                        v-model="remindForm.pushTime"
+                        v-model.trim="remindForm.pushTime"
                         :picker-options="{
             start: '00:00',
             step: '00:5',
@@ -168,7 +168,7 @@
       <el-form-item class="mh-child"
                     label="议题发布前经网络员审核："
                     prop="auditSwitch">
-        <el-switch v-model="auditSwitchShow"
+        <el-switch v-model.trim="auditSwitchShow"
                    active-text="开启"
                    inactive-text="关闭"
                    class="overtime-input">
@@ -195,7 +195,7 @@
       <el-form-item class="mh-child"
                     label="待办事项发送短信通知："
                     prop="switch">
-        <el-switch v-model="msgForm.switchShow"
+        <el-switch v-model.trim="msgForm.switchShow"
                    active-text="开启"
                    inactive-text="关闭"
                    class="overtime-input">
@@ -206,7 +206,7 @@
                     label="剩余短信数量："
                     prop="remindTime">
         <el-input-number class="overtime-input"
-                         v-model="msgForm.remain"></el-input-number>
+                         v-model.trim="msgForm.remain"></el-input-number>
         <span style="padding: 25px">单位条</span>
       </el-form-item>
     </el-form>
@@ -228,7 +228,7 @@
       <el-form-item class="mh-child"
                     label="新建小组进组需小组审核："
                     prop="switch">
-        <el-switch v-model="reviewForm.switchShow"
+        <el-switch v-model.trim="reviewForm.switchShow"
                    active-text="开启"
                    inactive-text="关闭"
                    class="overtime-input">
diff --git a/src/views/modules/customer/customize/RoleAuth.vue b/src/views/modules/customer/customize/RoleAuth.vue
index a4b5537e5..fa8c49781 100644
--- a/src/views/modules/customer/customize/RoleAuth.vue
+++ b/src/views/modules/customer/customize/RoleAuth.vue
@@ -8,7 +8,7 @@
                    @click="diaCancel">取消返回</el-button>
 
       </div>
-      <el-tabs v-model="activeName"
+      <el-tabs v-model.trim="activeName"
                @tab-click="tabClick"
                class="el-tabs">
         <el-tab-pane label="工作端"
@@ -36,7 +36,7 @@
                              width="180">
               <template slot-scope="scope">
                 <el-input v-if="scope.row.isEdit"
-                          v-model="scope.row.roleName"
+                          v-model.trim="scope.row.roleName"
                           clearable>
                 </el-input>
                 <span v-else>{{scope.row.constName}}</span>
@@ -107,7 +107,7 @@
            v-if="dutyShow">
         <el-input type="textarea"
                   :rows="8"
-                  v-model="description"></el-input>
+                  v-model.trim="description"></el-input>
         <div class="div_btn_dia">
           <el-button type="primary"
                      size="small"
@@ -170,7 +170,7 @@
               <el-col v-loading="loading3">
                 <el-card shadow="hover">
                   <el-checkbox-group class="t"
-                                     v-model="checkedScopes"
+                                     v-model.trim="checkedScopes"
                                      @change="roleChange">
                     <el-checkbox v-for="scope in scopeOptions"
                                  :label="scope.scopeKey"
diff --git a/src/views/modules/customer/customize/StartPage.vue b/src/views/modules/customer/customize/StartPage.vue
index d5e7cbdba..44177f8be 100644
--- a/src/views/modules/customer/customize/StartPage.vue
+++ b/src/views/modules/customer/customize/StartPage.vue
@@ -37,7 +37,7 @@
 
             <div class="div_time">
               <span>展示时长：</span>
-              <el-input-number v-model="resiForm.time"
+              <el-input-number v-model.trim="resiForm.time"
                                style="width:200px;margin-left:10px"
                                :min="3"
                                :max="10"
@@ -90,7 +90,7 @@
 
               <div class="div_time">
                 <span>展示时长：</span>
-                <el-input-number v-model="workForm.time"
+                <el-input-number v-model.trim="workForm.time"
                                  style="width:200px;margin-left:10px"
                                  :min="3"
                                  :max="10"
diff --git a/src/views/modules/customer/customize/editSys.vue b/src/views/modules/customer/customize/editSys.vue
index 4e9811d5a..5044b2efb 100644
--- a/src/views/modules/customer/customize/editSys.vue
+++ b/src/views/modules/customer/customize/editSys.vue
@@ -16,7 +16,7 @@
           <el-form-item prop="platformName"
                         label="系统名称">
 
-            <el-input v-model="formData.platformName" style="width: 100%;"></el-input>
+            <el-input v-model.trim="formData.platformName" style="width: 100%;"></el-input>
           </el-form-item>
           <el-form-item prop="icon"
                         label="Logo">
diff --git a/src/views/modules/customer/customize/roleList.vue b/src/views/modules/customer/customize/roleList.vue
index 8a73e0d86..037b0b4fd 100644
--- a/src/views/modules/customer/customize/roleList.vue
+++ b/src/views/modules/customer/customize/roleList.vue
@@ -21,7 +21,7 @@
                          width="160">
           <template slot-scope="scope">
             <el-input v-if="scope.row.isEdit"
-                      v-model="scope.row.roleName"
+                      v-model.trim="scope.row.roleName"
                       clearable>
             </el-input>
             <span v-else>{{scope.row.constName}}</span>
@@ -84,7 +84,7 @@
           <el-col v-loading="loading3">
             <el-card shadow="hover">
               <el-checkbox-group class="t"
-                                 v-model="checkedScopes"
+                                 v-model.trim="checkedScopes"
                                  @change="roleChange">
                 <el-checkbox v-for="scope in scopeOptions"
                              :label="scope.scopeKey"
@@ -94,7 +94,7 @@
           </el-col>
           <!-- <el-col :span="8">
           <el-card shadow="hover">
-            <el-checkbox-group class="t" v-model="checkedSettings">
+            <el-checkbox-group class="t" v-model.trim="checkedSettings">
               <el-checkbox
                 v-for="setting in settingOptions"
                 :label="setting.settingKey"
diff --git a/src/views/modules/customer/feedback/CustomerInfo.vue b/src/views/modules/customer/feedback/CustomerInfo.vue
index f297c443b..5aa1e8e36 100644
--- a/src/views/modules/customer/feedback/CustomerInfo.vue
+++ b/src/views/modules/customer/feedback/CustomerInfo.vue
@@ -18,7 +18,7 @@
           <el-form-item label="客户名称"
                         prop="customerName">
             <el-input class="item_width_1"
-                      v-model="dataForm.customerInfoDTO.customerName"
+                      v-model.trim="dataForm.customerInfoDTO.customerName"
                       placeholder="客户名称"></el-input>
           </el-form-item>
 
diff --git a/src/views/modules/customer/feedback/DetailForm.vue b/src/views/modules/customer/feedback/DetailForm.vue
index bc824e6a4..c4c95ea0c 100644
--- a/src/views/modules/customer/feedback/DetailForm.vue
+++ b/src/views/modules/customer/feedback/DetailForm.vue
@@ -273,7 +273,7 @@
                               show-word-limit
                               style="width:600px"
                               placeholder='请输入回复内容'
-                              v-model="adviceData.replyContent"></el-input>
+                              v-model.trim="adviceData.replyContent"></el-input>
                     <div class="input_tip">建议只可回复一次，请谨慎回复</div>
 
                   </el-col>
@@ -298,7 +298,7 @@
                               style="width:600px"
                               show-word-limit
                               placeholder='请输入政府回复文本'
-                              v-model="adviceData.govContent"></el-input>
+                              v-model.trim="adviceData.govContent"></el-input>
                   </el-col>
 
                 </el-row>
diff --git a/src/views/modules/customer/feedback/FeedbackList.vue b/src/views/modules/customer/feedback/FeedbackList.vue
index fd9bd27bb..bd805bf03 100644
--- a/src/views/modules/customer/feedback/FeedbackList.vue
+++ b/src/views/modules/customer/feedback/FeedbackList.vue
@@ -9,7 +9,7 @@
           <div>
             <el-form-item label="客户"
                           :label-width="labelWidth">
-              <el-select v-model="tableParams.customerId"
+              <el-select v-model.trim="tableParams.customerId"
                          placeholder="客户"
                          clear
                          @change="customerChange"
@@ -43,7 +43,7 @@
             </el-form-item>
             <el-form-item label="问题分类"
                           :label-width="labelWidth">
-              <el-select v-model="tableParams.adviceType"
+              <el-select v-model.trim="tableParams.adviceType"
                          placeholder="问题分类"
                          clearable>
                 <el-option v-for="item in form.data['adviceType']"
@@ -59,7 +59,7 @@
           <div>
             <el-form-item label="回复状态"
                           :label-width="labelWidth">
-              <el-select v-model="tableParams.isReply"
+              <el-select v-model.trim="tableParams.isReply"
                          placeholder="回复状态"
                          clearable>
                 <el-option v-for="item in form.data['isReply']"
@@ -71,7 +71,7 @@
             </el-form-item>
             <el-form-item label="开始时间"
                           :label-width="labelWidth">
-              <el-date-picker v-model="tableParams.startTime"
+              <el-date-picker v-model.trim="tableParams.startTime"
                               style="width:200px;"
                               type="datetime"
                               :picker-options="startPickerTime"
@@ -82,7 +82,7 @@
 
             <el-form-item label="结束时间"
                           :label-width="labelWidth">
-              <el-date-picker v-model="tableParams.endTime"
+              <el-date-picker v-model.trim="tableParams.endTime"
                               style="width:200px;"
                               type="datetime"
                               :picker-options="endPickerTime"
diff --git a/src/views/modules/customer/feedback/customer-manage.vue b/src/views/modules/customer/feedback/customer-manage.vue
index e1fb3d48f..3719d8ad1 100644
--- a/src/views/modules/customer/feedback/customer-manage.vue
+++ b/src/views/modules/customer/feedback/customer-manage.vue
@@ -72,7 +72,7 @@
                  status-icon>
           <el-form-item prop="customerName"
                         label="客户名称">
-            <el-input v-model="dataForm2.customerName"
+            <el-input v-model.trim="dataForm2.customerName"
                       key="customerName">
               <span slot="prefix"
                     class="el-input__icon">
@@ -85,7 +85,7 @@
           </el-form-item>
           <el-form-item prop="organizationLevel"
                         label="组织级别">
-            <el-select v-model="dataForm2.organizationLevel"
+            <el-select v-model.trim="dataForm2.organizationLevel"
                        key="organizationLevel">
               <el-option v-for="(val, key) in organizationLevels"
                          :key="key"
@@ -122,7 +122,7 @@
                  status-icon>
           <el-form-item prop="agencyName"
                         label="组织名称">
-            <el-input v-model="dataForm3.agencyName"
+            <el-input v-model.trim="dataForm3.agencyName"
                       key="agencyName">
               <span slot="prefix"
                     class="el-input__icon">
@@ -135,7 +135,7 @@
           </el-form-item>
           <el-form-item prop="level"
                         label="组织级别">
-            <el-select v-model="dataForm3.level"
+            <el-select v-model.trim="dataForm3.level"
                        key="level"
                        @change="onLevelChange">
               <el-option v-for="(val, key) in organizationLevels"
@@ -158,7 +158,7 @@
           </el-form-item>
           <el-form-item prop="areaCode"
                         label="地区编码">
-            <el-input v-model="dataForm3.areaCode"
+            <el-input v-model.trim="dataForm3.areaCode"
                       key="areaCode"
                       disabled></el-input>
           </el-form-item>
@@ -178,7 +178,7 @@
                  status-icon>
           <el-form-item prop="realName"
                         label="姓名">
-            <el-input v-model="dataForm4.realName"
+            <el-input v-model.trim="dataForm4.realName"
                       key="realName">
               <span slot="prefix"
                     class="el-input__icon">
@@ -191,7 +191,7 @@
           </el-form-item>
           <el-form-item prop="gender"
                         label="性别">
-            <el-select v-model="dataForm4.gender"
+            <el-select v-model.trim="dataForm4.gender"
                        key="gender">
               <el-option v-for="(val, key) in genders"
                          :key="key"
diff --git a/src/views/modules/customer/init/RegisterList.vue b/src/views/modules/customer/init/RegisterList.vue
index 86b0bf03a..b78a83043 100644
--- a/src/views/modules/customer/init/RegisterList.vue
+++ b/src/views/modules/customer/init/RegisterList.vue
@@ -7,7 +7,7 @@
                  :model="dataForm"
                  @keyup.enter.native="loadData()">
           <el-form-item>
-            <el-input v-model="dataForm.name"
+            <el-input v-model.trim="dataForm.name"
                       placeholder="组织名称">
             </el-input>
           </el-form-item>
@@ -86,7 +86,7 @@
       <div ref="ref_sub"
            style=" position: relative;">
 
-        <el-tabs v-model="activeName"
+        <el-tabs v-model.trim="activeName"
                  class="el-tabs">
           <el-tab-pane label="居民端"
                        name="resi">
diff --git a/src/views/modules/customer/manage/CustomerInfo.vue b/src/views/modules/customer/manage/CustomerInfo.vue
index 83b1369b2..a9befa48c 100644
--- a/src/views/modules/customer/manage/CustomerInfo.vue
+++ b/src/views/modules/customer/manage/CustomerInfo.vue
@@ -18,7 +18,7 @@
           <el-form-item label="客户名称"
                         prop="customerName">
             <el-input class="item_width_1"
-                      v-model="dataForm.customerInfoDTO.customerName"
+                      v-model.trim="dataForm.customerInfoDTO.customerName"
                       placeholder="客户名称"></el-input>
           </el-form-item>
 
diff --git a/src/views/modules/customer/manage/CustomerList.vue b/src/views/modules/customer/manage/CustomerList.vue
index 15d7ccd40..709794893 100644
--- a/src/views/modules/customer/manage/CustomerList.vue
+++ b/src/views/modules/customer/manage/CustomerList.vue
@@ -7,7 +7,7 @@
                  :model="tableParams"
                  @keyup.enter.native="loadData()">
           <el-form-item>
-            <el-input v-model="tableParams.customerName"
+            <el-input v-model.trim="tableParams.customerName"
                       placeholder="客户名称">
             </el-input>
           </el-form-item>
diff --git a/src/views/modules/customer/manage/customer-manage.vue b/src/views/modules/customer/manage/customer-manage.vue
index ddc3c20ad..87fa3edae 100644
--- a/src/views/modules/customer/manage/customer-manage.vue
+++ b/src/views/modules/customer/manage/customer-manage.vue
@@ -71,7 +71,7 @@
                  status-icon>
           <el-form-item prop="customerName"
                         label="客户名称">
-            <el-input v-model="dataForm2.customerName"
+            <el-input v-model.trim="dataForm2.customerName"
                       key="customerName">
               <span slot="prefix"
                     class="el-input__icon">
@@ -84,7 +84,7 @@
           </el-form-item>
           <el-form-item prop="organizationLevel"
                         label="组织级别">
-            <el-select v-model="dataForm2.organizationLevel"
+            <el-select v-model.trim="dataForm2.organizationLevel"
                        key="organizationLevel">
               <el-option v-for="(val, key) in organizationLevels"
                          :key="key"
@@ -121,7 +121,7 @@
                  status-icon>
           <el-form-item prop="agencyName"
                         label="组织名称">
-            <el-input v-model="dataForm3.agencyName"
+            <el-input v-model.trim="dataForm3.agencyName"
                       key="agencyName">
               <span slot="prefix"
                     class="el-input__icon">
@@ -134,7 +134,7 @@
           </el-form-item>
           <el-form-item prop="level"
                         label="组织级别">
-            <el-select v-model="dataForm3.level"
+            <el-select v-model.trim="dataForm3.level"
                        key="level"
                        @change="onLevelChange">
               <el-option v-for="(val, key) in organizationLevels"
@@ -157,7 +157,7 @@
           </el-form-item>
           <el-form-item prop="areaCode"
                         label="地区编码">
-            <el-input v-model="dataForm3.areaCode"
+            <el-input v-model.trim="dataForm3.areaCode"
                       key="areaCode"
                       disabled></el-input>
           </el-form-item>
@@ -177,7 +177,7 @@
                  status-icon>
           <el-form-item prop="realName"
                         label="姓名">
-            <el-input v-model="dataForm4.realName"
+            <el-input v-model.trim="dataForm4.realName"
                       key="realName">
               <span slot="prefix"
                     class="el-input__icon">
@@ -190,7 +190,7 @@
           </el-form-item>
           <el-form-item prop="gender"
                         label="性别">
-            <el-select v-model="dataForm4.gender"
+            <el-select v-model.trim="dataForm4.gender"
                        key="gender">
               <el-option v-for="(val, key) in genders"
                          :key="key"
diff --git a/src/views/modules/customer/miniProAgent/BasicInfo.vue b/src/views/modules/customer/miniProAgent/BasicInfo.vue
index 35d7a2476..e44c49bc1 100644
--- a/src/views/modules/customer/miniProAgent/BasicInfo.vue
+++ b/src/views/modules/customer/miniProAgent/BasicInfo.vue
@@ -14,7 +14,7 @@
                  type="primary"
                  size="mini"
                  @click="setDomains">保存</el-button>
-      <el-tabs v-model="activeName"
+      <el-tabs v-model.trim="activeName"
                class="el-tabs">
 
         <el-tab-pane :style="{height:formHeight+'px'}"
@@ -30,7 +30,7 @@
                    :key="index">
                 <el-input style="width:300px;display:block;margin-bottom:10px; float:left"
                           placeholder='请输入request 合法域名'
-                          v-model="formData.requestDomain[index]"> </el-input>
+                          v-model.trim="formData.requestDomain[index]"> </el-input>
 
                 <el-button v-if="index===0"
                            size="mini"
@@ -56,7 +56,7 @@
                    :key="index">
                 <el-input style="width:300px;display:block;margin-bottom:10px; float:left"
                           placeholder='请输入socket 合法域名'
-                          v-model="formData.wsRequestDomain[index]"> </el-input>
+                          v-model.trim="formData.wsRequestDomain[index]"> </el-input>
 
                 <el-button v-if="index===0"
                            size="mini"
@@ -82,7 +82,7 @@
                    :key="index">
                 <el-input style="width:300px;display:block;margin-bottom:10px; float:left"
                           placeholder='请输入uploadFile 合法域名'
-                          v-model="formData.uploadDomain[index]"> </el-input>
+                          v-model.trim="formData.uploadDomain[index]"> </el-input>
 
                 <el-button v-if="index===0"
                            size="mini"
@@ -108,7 +108,7 @@
                    :key="index">
                 <el-input style="width:300px;display:block;margin-bottom:10px; float:left"
                           placeholder='请输入downloadFile 合法域名'
-                          v-model="formData.downloadDomain[index]"> </el-input>
+                          v-model.trim="formData.downloadDomain[index]"> </el-input>
 
                 <el-button v-if="index===0"
                            size="mini"
@@ -152,7 +152,7 @@
                    :key="index">
                 <el-input style="width:300px;display:block;margin-bottom:10px; float:left"
                           placeholder='请输入业务域名'
-                          v-model="formData.webViewDomain[index]"> </el-input>
+                          v-model.trim="formData.webViewDomain[index]"> </el-input>
 
                 <el-button v-if="index===0"
                            size="mini"
diff --git a/src/views/modules/customer/miniProAgent/Category.vue b/src/views/modules/customer/miniProAgent/Category.vue
index 6a235b380..a3433db73 100644
--- a/src/views/modules/customer/miniProAgent/Category.vue
+++ b/src/views/modules/customer/miniProAgent/Category.vue
@@ -7,7 +7,7 @@
               @cancel="diaCancel"
               @ok="submitCode">
 
-      <el-tabs v-model="activeName"
+      <el-tabs v-model.trim="activeName"
                @tab-click="tabClick"
                class="el-tabs">
 
@@ -20,7 +20,7 @@
             <el-form-item label="UGC场景"
                           label-width="150px"
                           style="display:block">
-              <el-checkbox-group v-model="dataForm.ugcDeclare.scene">
+              <el-checkbox-group v-model.trim="dataForm.ugcDeclare.scene">
                 <el-checkbox @change="scene0"
                              :label="0">不涉及用户生成内容</el-checkbox>
                 <el-checkbox :label="1"
@@ -47,14 +47,14 @@
                           resize="none"
                           style="width:500px"
                           placeholder='请输入其他场景'
-                          v-model="dataForm.ugcDeclare.otherSceneDesc">
+                          v-model.trim="dataForm.ugcDeclare.otherSceneDesc">
                 </el-input>
                 <div class="el-upload__tip">当scene选其他时的说明,不超时256字</div>
               </el-form-item>
               <el-form-item label="内容安全机制"
                             label-width="150px"
                             style="display:block">
-                <el-checkbox-group v-model="dataForm.ugcDeclare.method">
+                <el-checkbox-group v-model.trim="dataForm.ugcDeclare.method">
                   <el-checkbox :label="1">使用平台建议的内容安全API</el-checkbox>
                   <el-checkbox :label="2">使用其他的内容审核产品</el-checkbox>
                   <el-checkbox :label="3">通过人工审核把关</el-checkbox>
@@ -65,7 +65,7 @@
               <el-form-item label="是否有审核团队"
                             label-width="150px"
                             style="display:block">
-                <el-radio-group v-model="dataForm.ugcDeclare.hasAuditTeam">
+                <el-radio-group v-model.trim="dataForm.ugcDeclare.hasAuditTeam">
                   <el-radio :label="0">无 </el-radio>
                   <el-radio :label="1">有 </el-radio>
                 </el-radio-group>
@@ -79,7 +79,7 @@
                           resize="none"
                           style="width:500px"
                           placeholder='请输入审核机制'
-                          v-model="dataForm.ugcDeclare.auditDesc">
+                          v-model.trim="dataForm.ugcDeclare.auditDesc">
                 </el-input>
                 <div class="el-upload__tip">说明当前对UGC内容的审核机制,不超过256字</div>
               </el-form-item>
diff --git a/src/views/modules/customer/miniProAgent/LowVersion.vue b/src/views/modules/customer/miniProAgent/LowVersion.vue
index bca814e6d..b615be36e 100644
--- a/src/views/modules/customer/miniProAgent/LowVersion.vue
+++ b/src/views/modules/customer/miniProAgent/LowVersion.vue
@@ -11,7 +11,7 @@
 
         <div class="mod-demo__demo}">
 
-          <el-input v-model="versionSearch"
+          <el-input v-model.trim="versionSearch"
                     @input="versionSearchInput"
                     style="width: 300px"
                     placeholder="请输入要查询的版本号"></el-input>
@@ -31,7 +31,7 @@
                              center>
               <template slot-scope="scope">
                 <el-radio :label="scope.row.version"
-                          v-model="templateRadio"
+                          v-model.trim="templateRadio"
                           @change.native="getRadioRow(scope.row)">&nbsp;</el-radio>
               </template>
             </el-table-column>
diff --git a/src/views/modules/customer/miniProAgent/MiniProList.vue b/src/views/modules/customer/miniProAgent/MiniProList.vue
index 3940efddf..91567d321 100644
--- a/src/views/modules/customer/miniProAgent/MiniProList.vue
+++ b/src/views/modules/customer/miniProAgent/MiniProList.vue
@@ -9,7 +9,7 @@
         <el-form :inline="true"
                  :model="tableParams">
           <el-form-item>
-            <el-select v-model="tableParams.customerId"
+            <el-select v-model.trim="tableParams.customerId"
                        placeholder="客户"
                        clearable>
               <el-option v-for="item in form.data['customerId']"
@@ -20,7 +20,7 @@
             </el-select>
           </el-form-item>
           <el-form-item>
-            <el-select v-model="tableParams.clientType"
+            <el-select v-model.trim="tableParams.clientType"
                        placeholder="类型"
                        clearable>
               <el-option v-for="item in form.data['clientType']"
diff --git a/src/views/modules/customer/miniProAgent/version/OperHistory.vue b/src/views/modules/customer/miniProAgent/version/OperHistory.vue
index fb0f480ac..6377d206d 100644
--- a/src/views/modules/customer/miniProAgent/version/OperHistory.vue
+++ b/src/views/modules/customer/miniProAgent/version/OperHistory.vue
@@ -6,7 +6,7 @@
               :dialogHeight="1.1"
               @cancel="diaCancel">
 
-      <el-tabs v-model="activeName"
+      <el-tabs v-model.trim="activeName"
                @tab-click="tabClick"
                class="el-tabs">
         <el-tab-pane label="操作历史"
diff --git a/src/views/modules/customer/miniProAgent/version/SubmitForm.vue b/src/views/modules/customer/miniProAgent/version/SubmitForm.vue
index f6f7de66f..d855fd712 100644
--- a/src/views/modules/customer/miniProAgent/version/SubmitForm.vue
+++ b/src/views/modules/customer/miniProAgent/version/SubmitForm.vue
@@ -9,7 +9,7 @@
                  @click="submitCode">提交</el-button>
     </div>
 
-    <el-tabs v-model="activeName"
+    <el-tabs v-model.trim="activeName"
              @tab-click="tabClick"
              class="el-tabs">
       <el-tab-pane label="功能说明"
@@ -29,7 +29,7 @@
                       maxlength="100"
                       show-word-limit
                       placeholder='请输入版本功能说明'
-                      v-model="dataForm.versionDesc">
+                      v-model.trim="dataForm.versionDesc">
             </el-input>
             <div class="el-upload__tip">小程序版本说明和功能解释,最多不超过100个字</div>
           </el-form-item>
@@ -74,7 +74,7 @@
           <!-- <el-form-item label="审核加急"
                         label-width="150px"
                         style="display:block">
-            <el-radio-group v-model="dataForm.isSpeed">
+            <el-radio-group v-model.trim="dataForm.isSpeed">
               <el-radio :label="false">不加急 </el-radio>
               <el-radio :label="true">加急 </el-radio>
             </el-radio-group>
@@ -98,7 +98,7 @@
           <el-form-item label="UGC场景"
                         label-width="150px"
                         style="display:block">
-            <el-checkbox-group v-model="dataForm.ugcDeclare.scene">
+            <el-checkbox-group v-model.trim="dataForm.ugcDeclare.scene">
               <el-checkbox @change="scene0"
                            :label="0">不涉及用户生成内容</el-checkbox>
               <el-checkbox :label="1"
@@ -126,14 +126,14 @@
                         maxlength="256"
                         show-word-limit
                         placeholder='请输入其他场景'
-                        v-model="dataForm.ugcDeclare.otherSceneDesc">
+                        v-model.trim="dataForm.ugcDeclare.otherSceneDesc">
               </el-input>
               <div class="el-upload__tip">当scene选其他时的说明,不超时256字</div>
             </el-form-item>
             <el-form-item label="内容安全机制"
                           label-width="150px"
                           style="display:block">
-              <el-checkbox-group v-model="dataForm.ugcDeclare.method">
+              <el-checkbox-group v-model.trim="dataForm.ugcDeclare.method">
                 <el-checkbox :label="1">使用平台建议的内容安全API</el-checkbox>
                 <el-checkbox :label="2">使用其他的内容审核产品</el-checkbox>
                 <el-checkbox :label="3">通过人工审核把关</el-checkbox>
@@ -144,7 +144,7 @@
             <el-form-item label="是否有审核团队"
                           label-width="150px"
                           style="display:block">
-              <el-radio-group v-model="dataForm.ugcDeclare.hasAuditTeam">
+              <el-radio-group v-model.trim="dataForm.ugcDeclare.hasAuditTeam">
                 <el-radio :label="0">无 </el-radio>
                 <el-radio :label="1">有 </el-radio>
               </el-radio-group>
@@ -159,7 +159,7 @@
                         maxlength="256"
                         show-word-limit
                         placeholder='请输入审核机制'
-                        v-model="dataForm.ugcDeclare.auditDesc">
+                        v-model.trim="dataForm.ugcDeclare.auditDesc">
               </el-input>
               <div class="el-upload__tip">说明当前对UGC内容的审核机制,不超过256字</div>
             </el-form-item>
diff --git a/src/views/modules/customer/miniProAgent/version/SubmitFormReject.vue b/src/views/modules/customer/miniProAgent/version/SubmitFormReject.vue
index fca05f04e..e114d0824 100644
--- a/src/views/modules/customer/miniProAgent/version/SubmitFormReject.vue
+++ b/src/views/modules/customer/miniProAgent/version/SubmitFormReject.vue
@@ -20,7 +20,7 @@
                   resize="none"
                   style="width:600px"
                   placeholder='请输入反馈内容'
-                  v-model="dataForm.feedbackInfo">
+                  v-model.trim="dataForm.feedbackInfo">
         </el-input>
         <div slot="tip"
              class="el-upload__tip">反馈内容，至多200字，只有上个版本被驳回才可填写</div>
diff --git a/src/views/modules/customer/miniProAgent/version/SubmitItem.vue b/src/views/modules/customer/miniProAgent/version/SubmitItem.vue
index b221f7787..3f2a07339 100644
--- a/src/views/modules/customer/miniProAgent/version/SubmitItem.vue
+++ b/src/views/modules/customer/miniProAgent/version/SubmitItem.vue
@@ -9,7 +9,7 @@
       <el-form-item label="页面列表"
                     prop="versionDesc"
                     label-width="100px">
-        <el-select v-model="dataForm.address"
+        <el-select v-model.trim="dataForm.address"
                    placeholder="页面列表"
                    style="width:300px"
                    filterable>
@@ -31,7 +31,7 @@
                   :rows="3"
                   maxlength="20"
                   show-word-limit
-                  v-model="dataForm.tag">
+                  v-model.trim="dataForm.tag">
         </el-input>
         <div class="el-upload__tip">小程序的标签，用空格分隔，标签至多10个，标签长度至多20</div>
       </el-form-item>
@@ -46,7 +46,7 @@
                   :rows="3"
                   maxlength="32"
                   show-word-limit
-                  v-model="dataForm.title">
+                  v-model.trim="dataForm.title">
         </el-input>
         <div class="el-upload__tip">小程序页面的标题，标题长度至多32</div>
       </el-form-item>
@@ -64,7 +64,7 @@
                            center>
             <template slot-scope="scope">
               <el-radio :label="scope.row.id"
-                        v-model="templateRadio"
+                        v-model.trim="templateRadio"
                         @change.native="getRadioRow(scope.$index,scope.row)">&nbsp;</el-radio>
             </template>
           </el-table-column>
diff --git a/src/views/modules/customer/miniProAgent/version/VersionItem.vue b/src/views/modules/customer/miniProAgent/version/VersionItem.vue
index 4b33e0454..81198ae6e 100644
--- a/src/views/modules/customer/miniProAgent/version/VersionItem.vue
+++ b/src/views/modules/customer/miniProAgent/version/VersionItem.vue
@@ -238,7 +238,7 @@
               @cancel="grayreleaseDiaCancel"
               @ok="grayreleaseOk">
       <div style="text-align:center;margin-top:40px">灰度（%）：
-        <el-input-number v-model="grayPercentage"
+        <el-input-number v-model.trim="grayPercentage"
                          :min="0"
                          :max="100"
                          label="灰度百分比"></el-input-number>
diff --git a/src/views/modules/customer/role.vue b/src/views/modules/customer/role.vue
index 72e658543..6db0aceae 100644
--- a/src/views/modules/customer/role.vue
+++ b/src/views/modules/customer/role.vue
@@ -19,7 +19,7 @@
                          width="160">
           <template slot-scope="scope">
             <el-input v-if="scope.row.isEdit"
-                      v-model="scope.row.roleName"
+                      v-model.trim="scope.row.roleName"
                       clearable>
             </el-input>
             <span v-else>{{scope.row.constName}}</span>
@@ -92,7 +92,7 @@
               <el-col v-loading="loading3">
                 <el-card shadow="hover">
                   <el-checkbox-group class="t"
-                                     v-model="checkedScopes"
+                                     v-model.trim="checkedScopes"
                                      @change="roleChange">
                     <el-checkbox v-for="scope in scopeOptions"
                                  :label="scope.scopeKey"
diff --git a/src/views/modules/dataExport/operStatic.vue b/src/views/modules/dataExport/operStatic.vue
index 876d26c64..cc234b351 100644
--- a/src/views/modules/dataExport/operStatic.vue
+++ b/src/views/modules/dataExport/operStatic.vue
@@ -10,7 +10,7 @@
           <div>
             <el-form-item label="选择客户"
                           :label-width="labelWidth">
-              <el-select v-model="tableParams.customerId"
+              <el-select v-model.trim="tableParams.customerId"
                          placeholder="客户"
                          clearable>
                 <el-option v-for="(item,index) in customerList"
@@ -24,7 +24,7 @@
             <el-form-item label="所属组织"
                           :label-width="labelWidth">
               <el-cascader ref="myCascader"
-                           v-model="agencyIdArray"
+                           v-model.trim="agencyIdArray"
                            style="width:480px"
                            :key="iscascaderShow"
                            :options="casOptions"
@@ -36,14 +36,14 @@
             <div>
               <el-form-item label="统计类型"
                             :label-width="labelWidth">
-                <el-radio v-model="tableParams.type"
+                <el-radio v-model.trim="tableParams.type"
                           label="end">截止累计值</el-radio>
-                <el-radio v-model="tableParams.type"
+                <el-radio v-model.trim="tableParams.type"
                           label="Interval">区间新增值</el-radio>
 
                 <el-date-picker style="margin-left:30px"
                                 v-if="tableParams.type==='Interval'"
-                                v-model="timeArray"
+                                v-model.trim="timeArray"
                                 type="daterange"
                                 range-separator="至"
                                 @change="handleTimeChange"
@@ -55,7 +55,7 @@
 
                 <el-date-picker style="margin-left:30px"
                                 v-if="tableParams.type==='end'"
-                                v-model="endTimeModel"
+                                v-model.trim="endTimeModel"
                                 @change="handleEndTimeChange"
                                 :picker-options="pickerOptions"
                                 type="date"
diff --git a/src/views/modules/demo/demo-add-or-update.vue b/src/views/modules/demo/demo-add-or-update.vue
index 7eccb2071..435efb489 100644
--- a/src/views/modules/demo/demo-add-or-update.vue
+++ b/src/views/modules/demo/demo-add-or-update.vue
@@ -2,13 +2,13 @@
   <el-dialog :visible.sync="visible" :title="!dataForm.id ? $t('add') : $t('update')" :close-on-click-modal="false" :close-on-press-escape="false">
     <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" :label-width="$i18n.locale === 'en-US' ? '120px' : '80px'">
           <el-form-item label="姓名" prop="realName">
-          <el-input v-model="dataForm.realName" placeholder="姓名"></el-input>
+          <el-input v-model.trim="dataForm.realName" placeholder="姓名"></el-input>
       </el-form-item>
           <el-form-item label="联系电话" prop="mobile">
-          <el-input v-model="dataForm.mobile" placeholder="联系电话"></el-input>
+          <el-input v-model.trim="dataForm.mobile" placeholder="联系电话"></el-input>
       </el-form-item>
           <el-form-item label="证件号" prop="identityNo">
-          <el-input v-model="dataForm.identityNo" placeholder="证件号"></el-input>
+          <el-input v-model.trim="dataForm.identityNo" placeholder="证件号"></el-input>
           </el-form-item>
       </el-form>
     <template slot="footer">
diff --git a/src/views/modules/demo/demo.vue b/src/views/modules/demo/demo.vue
index 733ace148..578a72ea7 100644
--- a/src/views/modules/demo/demo.vue
+++ b/src/views/modules/demo/demo.vue
@@ -6,17 +6,17 @@
                :model="dataForm"
                @keyup.enter.native="getDataList()">
         <el-form-item>
-          <el-input v-model="dataForm.mobile"
+          <el-input v-model.trim="dataForm.mobile"
                     placeholder="联系电话"
                     clearable></el-input>
         </el-form-item>
         <el-form-item>
-          <el-input v-model="dataForm.realName"
+          <el-input v-model.trim="dataForm.realName"
                     placeholder="姓名"
                     clearable></el-input>
         </el-form-item>
         <el-form-item>
-          <el-input v-model="dataForm.identityNo"
+          <el-input v-model.trim="dataForm.identityNo"
                     placeholder="证件号"
                     clearable></el-input>
         </el-form-item>
diff --git a/src/views/modules/goverhotline/followDetail.vue b/src/views/modules/goverhotline/followDetail.vue
index 4b3b9f052..26d758bb6 100644
--- a/src/views/modules/goverhotline/followDetail.vue
+++ b/src/views/modules/goverhotline/followDetail.vue
@@ -34,25 +34,25 @@
         <el-row type="flex" justify="" class="f-top24">
             <el-col :span="24" class="f-flex f-align_item"><span class="label">是否完成：</span>
                 <div class="f-flex1">
-                   <el-radio v-model="formData.completeFlag" :label="0" :disabled="disabled" >正在推进</el-radio>
-                   <el-radio v-model="formData.completeFlag" :label="1" :disabled="disabled" >已完成</el-radio>
-                   <el-radio v-model="formData.completeFlag" :label="2" :disabled="disabled" >已完成并取消风险标记</el-radio>
+                   <el-radio v-model.trim="formData.completeFlag" :label="0" :disabled="disabled" >正在推进</el-radio>
+                   <el-radio v-model.trim="formData.completeFlag" :label="1" :disabled="disabled" >已完成</el-radio>
+                   <el-radio v-model.trim="formData.completeFlag" :label="2" :disabled="disabled" >已完成并取消风险标记</el-radio>
                 </div>
             </el-col>
         </el-row>
         <el-row type="flex" justify="" class="f-top24">
             <el-col :span="24" class="f-flex f-align_item"><span class="label">组织类型：</span>
                 <div class="f-flex1">
-                   <el-radio v-model="formData.orgCategoryCode" label="province" :disabled="disabled">省</el-radio>
-                   <el-radio v-model="formData.orgCategoryCode" label="city" :disabled="disabled">市</el-radio>
-                   <el-radio v-model="formData.orgCategoryCode" label="district" :disabled="disabled">区</el-radio>
+                   <el-radio v-model.trim="formData.orgCategoryCode" label="province" :disabled="disabled">省</el-radio>
+                   <el-radio v-model.trim="formData.orgCategoryCode" label="city" :disabled="disabled">市</el-radio>
+                   <el-radio v-model.trim="formData.orgCategoryCode" label="district" :disabled="disabled">区</el-radio>
                 </div>
             </el-col>
         </el-row>
         <el-row type="flex" justify="" class="f-top24">
             <el-col :span="24" class="f-flex f-align_item"><span class="label">完成时限：</span>
                 <div class="f-flex1">
-                    <el-date-picker v-model="formData.completeTime" type="date" value-format="yyyy-MM-dd HH:mm:ss" placeholder="选择日期"
+                    <el-date-picker v-model.trim="formData.completeTime" type="date" value-format="yyyy-MM-dd HH:mm:ss" placeholder="选择日期"
                             style="width: 202px" clearable :disabled="disabled">
                         </el-date-picker>
                 </div>
@@ -66,7 +66,7 @@
                       :rows="3"
                       style="width: 300px;"
                       placeholder="请输入内容"
-                      v-model="formData.remark"
+                      v-model.trim="formData.remark"
                       :disabled="disabled"
                       >
                     </el-input> 
diff --git a/src/views/modules/goverhotline/index.vue b/src/views/modules/goverhotline/index.vue
index 28bd9a050..d413df81f 100644
--- a/src/views/modules/goverhotline/index.vue
+++ b/src/views/modules/goverhotline/index.vue
@@ -5,11 +5,11 @@
           <div class="m-search">
               <el-form :inline="true" :model="formData" ref="ref_searchform" :label-width="'100px'">
                   <el-form-item label="统计时间">
-                      <el-date-picker v-model="formData.queryDateStart" type="date" value-format="yyyy-MM-dd" placeholder="开始时间"
+                      <el-date-picker v-model.trim="formData.queryDateStart" type="date" value-format="yyyy-MM-dd" placeholder="开始时间"
                           style="width: 202px" clearable>
                       </el-date-picker>
                            至
-                      <el-date-picker v-model="formData.queryDateEnd" type="date" value-format="yyyy-MM-dd" placeholder="结束时间"
+                      <el-date-picker v-model.trim="formData.queryDateEnd" type="date" value-format="yyyy-MM-dd" placeholder="结束时间"
                           style="width: 202px" clearable>
                       </el-date-picker>
                   </el-form-item>
diff --git a/src/views/modules/home/cpts/notice_version_update.vue b/src/views/modules/home/cpts/notice_version_update.vue
new file mode 100644
index 000000000..e24a736fb
--- /dev/null
+++ b/src/views/modules/home/cpts/notice_version_update.vue
@@ -0,0 +1,48 @@
+<template>
+    <div class=''>
+        <div v-html="detailData.richContent" class="ql-editor"></div>
+    </div>
+</template>
+
+<script>
+import { requestGet} from "@/js/dai/request";
+import { mapGetters } from "vuex";
+export default {
+    data() {
+        return {
+            detailData:null
+        };
+    },
+    activated() {
+        this.getNoticeDetail()
+    },
+    methods: {
+        async getNoticeDetail() {
+			const url = `/sys/sysVersionUpgrade/detail/${this.$route.query.version_id}`;
+			const { data, code, msg } = await requestGet(url);
+			if (code === 0) {
+                this.detailData= data;
+			} else {
+				this.$message.error(msg);
+			}
+		},
+    },
+    components:{},
+    computed:{
+        maxTableHeight () {
+      return this.$store.state.inIframe
+        ? this.clientHeight - 360 + this.iframeHeigh
+        : this.clientHeight ;
+    },
+    ...mapGetters(["clientHeight", "iframeHeight"]),
+    },
+    watch: {},
+}
+</script>
+
+<style lang='scss' scoped>
+   .ql-editor{
+    background: #fff;
+    margin: 10px 6px;
+   }
+</style>
diff --git a/src/views/modules/home/index.vue b/src/views/modules/home/index.vue
index 690f919e2..ab56d17ca 100644
--- a/src/views/modules/home/index.vue
+++ b/src/views/modules/home/index.vue
@@ -4,10 +4,9 @@
       <div class="g-row-left">
         <div class="m-box m-search">
           <div class="wrap">
-            <div class="title">
+            <!-- <div class="title">
               <span>社区查询</span>
-            </div>
-
+            </div> -->
             <div class="tabs">
               <div :class="{ 'z-on': searchData.type == 'jumin' }" @click="searchDataTab('jumin')">查居民</div>
               <div :class="{ 'z-on': searchData.type == 'fangwu' }" @click="searchDataTab('fangwu')">查房屋</div>
@@ -16,131 +15,126 @@
             <div class="search">
               <div class="search-input">
                 <div class="input">
-                  <input type="text" :placeholder="typePlaceholder[searchData.type]" v-model="searchData.searchKey" @keyup.enter="handleClickSearchBtn" />
+                  <input type="text" :placeholder="typePlaceholder[searchData.type]" v-model.trim="searchData.searchKey"
+                    @keyup.enter="handleClickSearchBtn" />
 
                   <div class="close-btn" v-if="searchData.searchKey != ''" @click="searchData.searchKey = ''">
                     <img src="@/assets/img/shequ/close.png" />
                   </div>
                 </div>
-                <div class="btn" @click="handleClickSearchBtn">查一下</div>
+                <div class="btn" @click="handleClickSearchBtn">查询</div>
               </div>
             </div>
           </div>
-        </div>
-        <div class="m-pan m-box">
-          <div class="header">
-            <img src="@/assets/images/index/title-icon-sqzl.png" />
-            <span>组织总览</span>
+
+          <div class="mewq">
+            <div class="boxss">
+              <div style="margin-top: 10px;" @click="handelClickToResi">
+                <span style="color: #2683DB; font-size: 25px;">
+                  {{ pandectData.totalResidents }}
+                </span>
+
+                <br>
+                <span style="color: #858585; font-size: 12px;">居民总数</span>
+              </div>
+            </div>
+            <div class="boxss">
+              <div style="margin-top: 10px;"  @click="handelClickToResi">
+                <span style="color: #2683DB; font-size: 25px;">{{ pandectData.permanentResiCount }}</span>
+                <br>
+                <span style="color: #858585; font-size: 12px;">常住人口</span>
+              </div>
+            </div>
+            <div class="boxss">
+              <div style="margin-top: 10px;"  @click="handelClickToResi">
+                <span style="color: #2683DB; font-size: 25px;">{{ pandectData.floatingResiCount }}</span>
+                <br>
+                <span style="color: #858585; font-size: 12px;">流动人口</span>
+              </div>
+            </div>
+            <div class="boxss">
+              <div style="margin-top: 10px;" @click="jumpToHouse('zongshu')">
+                <span style="color: #2683DB; font-size: 25px;">{{ pandectData.homeCount }}</span>
+                <br>
+                <span style="color: #858585; font-size: 12px;">房屋总数</span>
+              </div>
+            </div>
+            <div class="boxss" @click="jumpToHouse('zizhuM')">
+              <div style="margin-top: 10px;">
+                <span style="color: #2683DB; font-size: 25px;">{{ pandectData.selfStay }}</span>
+                <br>
+                <span style="color: #858585; font-size: 12px;">自住房屋</span>
+              </div>
+            </div>
+            <div class="boxss" @click="jumpToHouse('chuzuM')">
+              <div style="margin-top: 10px;">
+                <span style="color: #2683DB; font-size: 25px;">{{ pandectData.rentOut }}</span>
+                <br>
+                <span style="color: #858585; font-size: 12px;">出租房屋</span>
+              </div>
+            </div>
+            <div class="boxss" @click="jumpToHouse('xianzhiM')">
+              <div style="margin-top: 10px;">
+                <span style="color: #2683DB; font-size: 25px;">{{ pandectData.vacantHouse }}</span>
+                <br>
+                <span style="color: #858585; font-size: 12px;">闲置房屋</span>
+              </div>
+            </div>
           </div>
-          <div class="flex_box">
+        </div>
+        <div class="m-pan">
+          <div class="m-box flex_box m-pan">
+            <div class="header">
+              <div class="newqsa"><span>居民分类信息不完整数量统计</span></div>
+              <!-- <img src="@/assets/images/index/title-icon-zntb.png" /> -->
+            </div>
             <div class="cnt">
-              <div class="cnt-left">
-                <div class="subtitle">
-                  <img src="@/assets/images/index/i-sqjj.png"/>
-                  <span>{{agencyLevel!='district'?agencyLevel=='street'?'街道':agencyLevel=='community'?'社区':agencyLevel=='grid'?'网格':'组织':'组织'}}简介 </span>
-                </div>
-                <p>
-                 {{ pandectData.deptName }}，<span v-if="pandectData.gridCount">划分为 <b>{{
-                    pandectData.underCount
-                  }}</b> 个 <b>{{
-                    pandectData.underName
-                  }}，</b> </span> 现有房屋 <b>{{ pandectData.homeCount }}</b> 间，自住房屋 <b>{{
-                    pandectData.selfStay
-                  }}</b> 间、出租房屋 <b>{{
-                    pandectData.rentOut
-                  }}</b> 间、闲置房屋 <b>{{
-                    pandectData.vacantHouse
-                  }}</b> 间，现有居民 <b>{{ pandectData.resiCount }}</b> 户、 <b>{{
-                    pandectData.totalResidents
-                  }}</b> 人，其中常住人口 <b>{{ pandectData.permanentResiCount }}</b> 人，流动人口 <b>{{
-                    pandectData.floatingResiCount
-                  }}</b> 人，各类群体分布如下：
-                </p>
-
-                <div class="subtitle">
-                  <img src="@/assets/images/index/i-fxjg.png" />
-                  <span>分析结果</span>
-                </div>
+              <!-- 树状图 -->
+              <div class="echart" id="myBarchart" style="width: 100%; height: 100%;"></div>
+              <!-- 树状图end -->
+            </div>
+          </div>
+        </div>
 
-                <p class="hint" v-if="resiCategory.list.length > 0">
-                  根据数据分析结果，建议重点关注
-                  <b>{{ resiCategory.list[0].name }}、{{ resiCategory.list[1].name }}、{{ resiCategory.list[2].name }}</b>
-                  三类群体，开展相关的社区服务和活动。
-                </p>
-              </div>
-              <el-tabs v-model="activeName" style="width: calc(100% - 240px - 40px); margin-left: auto">
-                <el-tab-pane label="居民分类统计" name="resi">
-                  <div class="cnt-right">
-                    <div class="list">
-                      <div class="item" @click="handleClickCategory(item)" :key="item.code" v-for="(item, index) in resiCategory.list">
-                        <div>{{ ("0" + (index + 1)).substr(-2) }}.</div>
-                        <div class="item-name">
-                          {{ item.name }}
-                        </div>
-                        <div class="item-div"></div>
-                        <div class="item-count">{{ item.count }}人</div>
-                        <div class="item-progress">
-                          <b
-                            :style="{
-                              width: item.per + '%',
-                            }"></b>
-                        </div>
-                        <div class="item-per">{{ item.per }} %</div>
-                      </div>
-                    </div>
-                  </div>
-                </el-tab-pane>
-                <!-- <el-tab-pane label="智能预测"
-                             name="zhineng">
-                  <div class="cnt-right">
-                    <div class="list">
-                      <div class="item" :key="item.code" v-for="(item, index) in znycCategory.list">
-                        <div>{{ ("0" + (index + 1)).substr(-2) }}.</div>
-                        <div class="item-name">
-                          {{ item.name }}
-                        </div>
-                        <div class="item-div"></div>
-                        <div class="item-count">{{ item.count }}人</div>
-                        <div class="item-progress">
-                          <b
-                            :style="{
-                              width: item.per + '%',
-                            }"></b>
-                        </div>
-                        <div class="item-per">{{ item.per }} %</div>
-                      </div>
-                    </div>
-                  </div>
-                </el-tab-pane> -->
-              </el-tabs>
+        <div class="m-box m-tb">
+            <div class="header">
+              <div class="newqsa"><span>不满意事项(月度)趋势分析</span></div>
+              <!-- <img src="@/assets/images/index/title-icon-zntb.png" /> -->
             </div>
+          <!-- <div class="more">更多></div> -->
+          <div class="cnt">
+            <div id="my_chart" style="width: 100%; height: 170px;"></div>
           </div>
         </div>
+
       </div>
-      <div class="g-row-right">
+      <div class="g-row-right" style="margin-right: 20px;">
         <div class="m-box m-tx">
           <div class="header">
-            <img src="@/assets/images/index/title-icon-zntx.png" />
-            <span>智能提醒</span>
+            <div class="newqsa"><span>消息提醒</span></div>
+            <!-- <img src="@/assets/images/index/title-icon-zntx.png" /> -->
           </div>
           <div class="more" @click="toNoticePage">更多></div>
-          <div class="cnt" v-if="noticeData.length > 0">
-            <div @click="handleClickNotice(item)" class="item" :key="'notice' + item.targetId + index" v-for="(item, index) in noticeData">
-              <div class="item_left">
-                <i class="i-tag" v-if="item.readFlag == 1">已读</i>
-                <i class="i-tag" v-else>未读</i>
-              </div>
+          <div class="cnt" v-if="noticeData.length > 0" style="margin-top: 0px;">
+            <div @click="handleClickNotice(item)" class="item" :key="'notice' + item.targetId + index"
+              v-for="(item, index) in noticeData">
               <div class="item_right">
                 <div class="item-date">
                   {{ item.createdTime }}
                 </div>
-                <div class="item-title">
-                  {{ item.content }}
+                <div class="item-title"
+                  style="white-space: nowrap; overflow: hidden; text-overflow: ellipsis; max-width: 450px;">
+                  <img v-if="item.msgType == 'resident_category'" class="thumbnail_1" style="width: 17px;"
+                    referrerpolicy="no-referrer" src="~@/assets/images/shuju/renfang/index/zhiding.png" />{{
+                item.content }}
                 </div>
               </div>
+              <div class="item_left">
+                <i class="i-tag" v-if="item.readFlag == 1">已读</i>
+                <i class="i-tag" v-else>未读</i>
+              </div>
             </div>
           </div>
-
           <div class="cnt" v-else>
             <div class="empty">
               <img src="~@/assets/images/shuju/renfang/index/empty.png" />
@@ -148,16 +142,53 @@
             </div>
           </div>
         </div>
-        <div class="m-box m-tb">
-          <div class="wrap">
-            <div class="header">
-              <img src="@/assets/images/index/title-icon-zntb.png" />
-              <span>不满意事项月度趋势分析</span>
-            </div>
+
+        <div class="m-box m-tx" style="position: relative;">
+          <div class="header" style="display: flex;align-items: center;justify-content: space-between;"> <div class="newqsa"><span >居民信息更新情况</span></div> <div class="update-settings"  @click="jumpToJuMin()" v-show="showAll"><img referrerpolicy="no-referrer"
+                src="https://lanhu.oss-cn-beijing.aliyuncs.com/pskhmf0717eflwg54wn73s6spnsg6u48r0f69e94b-2bc8-4156-8330-902087b72e0b" />更新设置</div>
           </div>
-          <!-- <div class="more">更多></div> -->
-          <div class="cnt">
-            <div id="my_chart" style="width: 100%; height: 230px; position: relative; top: -10px"></div>
+          <div style="width: 100%;margin-top:26px;overflow-y: scroll; height:calc(100% - 79px);padding-bottom:15px; box-sizing: border-box" >
+            <el-table :data="tableList" 
+            border :cell-style="columnbackgroundStyle" class="m-table-item">
+            <el-table-column label="居民类别" align="center" width="105">
+              <template slot-scope="scope">
+                <span style="color:#989898">{{ scope.row.residentCategoryName }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="总人数" width="105" align="center">
+              <template slot-scope="scope">
+                  <span style="color:#006fd6;cursor: pointer;" @click="handelClickToResi(scope.row)">{{scope.row.total}}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="分类信息不完整数" align="center" :show-overflow-tooltip="true">
+              <template slot-scope="scope">
+                  <span style="color:#ff1200;cursor: pointer;"  @click="handelCLickJump(scope.row,'cateNonIntegrity')">{{scope.row.nonIntegratedNum}}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="拓展不完整数" align="center" :show-overflow-tooltip="true">
+              <template slot-scope="scope">
+                  <span style="color:#ff1200;cursor: pointer;"  @click="handelCLickJump(scope.row,'extNonIntegrity')">{{scope.row.extNonIntegratedNum}}</span>
+              </template>
+            </el-table-column>
+            
+            <el-table-column label="更新负责人" :show-overflow-tooltip="true" align="center" v-if="showAll">
+              <template slot-scope="scope">
+                  <span style="color:#989898;">{{scope.row.userName}}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="更新周期" align="center" width="105">
+              <template slot-scope="scope">
+                <span style="color:#989898;">{{ scope.row.updatePeriod ? scope.row.updatePeriod
+                == 'month' ? '每自然月' : scope.row.updatePeriod == 'halfMonth' ? '每半自然月' : scope.row.updatePeriod
+                  == 'week' ? '每周' : '' : '' }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="更新人数" align="center" width="105">
+              <template slot-scope="scope">
+                  <span style="color:#006fd6;" @click="handelCLickJump(scope.row,'updateResiList')">{{scope.row.updateResiNum}}</span><span style="color:#989898;">({{scope.row.updatePeriodName?scope.row.updatePeriodName:'--'}})</span>
+              </template>
+            </el-table-column>
+          </el-table>
           </div>
         </div>
       </div>
@@ -183,6 +214,7 @@ export default {
         type: "jumin",
         searchKey: "",
       },
+      showAll: false,
 
       typePlaceholder: {
         jumin: "请输入姓名或联系电话或证件号",
@@ -195,6 +227,8 @@ export default {
         total: "",
         list: [],
       },
+      tableList: [
+      ],
       znycCategory: {
         loading: false,
         total: "",
@@ -215,22 +249,16 @@ export default {
         floatingResiCount: "",
         permanentResiCount: "",
       },
-
       noticeData: [],
-
       activeName: "resi",
-
       myChart: {},
-      agencyLevel:'',
+      myBarchart: {},
+      agencyLevel: '',
+      yData: [],
+      myChartStyle: { float: "left", width: "140%", height: "100%" },
     }
   },
-  computed: {
-    maxTableHeight() {
-      // return this.clientHeight - 450;
-      return 420;
-    },
-    ...mapGetters(["clientHeight"]),
-  },
+  computed: {},
   watch: {
     "searchData.searchKey": function (val) {
       if (val == "") {
@@ -246,26 +274,50 @@ export default {
       deep: true,
       immediate: true,
     },
+
+  },
+  created() {
   },
   mounted() {
+    // this.ehso();
+    //图形
+
+
     this.getApiData();
     this.$nextTick(() => {
       this.initChart()
+      this.initEcharts();
+
     })
     this.agencyLevel = localStorage.getItem("level", data.level);
     console.log(
-        "dynamicMenuRoutes----------------------------",
-        this.$store.state.sidebarMenuList
+      "dynamicMenuRoutes----------------------------",
+      this.$store.state.sidebarMenuList
     );
   },
   methods: {
+    formatNumber(number) {
+      if (typeof number === 'string') {
+        // 如果是字符串，去除非数字字符并转为数字类型
+        number = parseInt(number.replace(/\D/g, ''), 10);
+      }
+      return number.toLocaleString();
+    },
     initChart() {
       this.$http.get("/governance/satisfactionOverview/notSatisfactionTrend").then(({ data: { data } }) => {
         this.myChart = echarts.init(document.getElementById("my_chart"));
+        // console.log("123123", data.series)
         let series = data.series.map((item, index) => {
           return {
             ...item,
             type: "line",
+            lineStyle: { // 添加lineStyle属性来指定折线样式
+              color: index === 0 ? '#F76828' : index === 1 ? '#EDB42D' : '#0056D6' // 根据索引指定不同的颜色
+            },
+            symbol: 'none',
+            itemStyle: {
+              color: index === 0 ? '#F76828' : index === 1 ? '#EDB42D' : '#0056D6' // 设置折点颜色
+            }
           };
         });
         let option = {
@@ -274,7 +326,7 @@ export default {
           },
           legend: {
             data: data.series.map((item) => item.name),
-            bottom: "5%",
+            bottom: 0,
             icon: "rect",
             itemWidth: 20,
             itemHeight: 5,
@@ -283,7 +335,8 @@ export default {
           grid: {
             left: "3%",
             right: "4%",
-            bottom: "30%",
+            bottom: "13%",
+            top:'5',
             containLabel: true,
           },
           toolbox: {
@@ -294,7 +347,8 @@ export default {
           xAxis: {
             type: "category",
             boundaryGap: false,
-            data: data.monthTimes.map((item) => this.$moment(item).format("M") + "月"),
+            // data: data.monthTimes.map((item) => this.$moment(item).format("M") + "月"),
+            data: data.monthTimes
           },
           yAxis: {
             type: "value",
@@ -304,10 +358,40 @@ export default {
         this.myChart.setOption(option, true);
         window.addEventListener("resize", this.handleWindowResize);
       });
+      this.borderH();
+      const level = localStorage.getItem('level');
+      console.log('Stored level:', level);
+      if (level == 'community') {
+        this.showAll = true
+      }
     },
+
+    columnbackgroundStyle({ row, column, rowIndex, columnIndex }) {
+      if (columnIndex == 3 || columnIndex == 4 || columnIndex == 5) {
+        return 'background:#fffcf3;'
+      }
+    },
+
+    borderH() {
+      this.$http.post("/actual/base/residentCategoryUpdateInfo/getUpdateAndintegrityList").then(({ data: { data } }) => {
+        this.tableList = data
+        this.tableList.forEach(item => {
+          if (typeof item.total === 'number') {
+            item.total = this.formatNumberWithCommas(item.total);
+          }
+          if (typeof item.nonIntegratedNum === 'number') {
+            item.nonIntegratedNum = this.formatNumberWithCommas(item.nonIntegratedNum);
+          }
+
+        });
+        console.log("请求成功:", data);
+      });
+    },
+
     handleWindowResize() {
       if (this.myChart) {
         this.myChart.resize();
+        this.myBarchart.resize();
       }
     },
     searchDataTab(str) {
@@ -331,21 +415,98 @@ export default {
         this.$message.error(msg);
       }
     },
+    async readClearOne(item) {
+      const url = `/message/intelligentMessage/msg/clearOne/?msgId=${item.id}`;
+      const { data, code, msg } = await requestPost(url);
+      if (code == 0) {
+        this.getNoticeData();
+      } else if (code >= 8000) {
+        this.$message.error(msg);
+      }
+    },
     handleClickNotice(item) {
-      const { msgType, targetId } = item;
       this.readClearOne(item);
-      if (msgType == "community_house") {
-        this.$refs.fastcall.showHouseInfo(targetId);
-      } else if (msgType == "resident_base_info") {
-        this.$refs.fastcall.showResiInfo(targetId);
+      if (item.msgType == "community_house") {
+        let { agencyId, gridId, gridName, houseId, houseName, targetId } = item
+        this.$store.dispatch('saveDataH', { agencyId, gridId, gridName, houseId: targetId, houseName: '房屋详情' });
+        this.$router.push({ name: 'house-huaxiang' });
+        this.$store.state.contentTabs = this.$store.state.contentTabs.map(item => {
+          if (item.name === "house-huaxiang") {
+            return { ...item, title: '房屋信息' };
+          }
+          return item;
+        });
+      } else if (item.msgType == "resident_base_info") {
+        let {
+          agencyId,
+          gridId,
+          gridName,
+          gender,
+          homeId,
+          homeName,
+          name,
+          targetId,
+          deptName
+        } = item;
+        this.$store.dispatch("saveData", {
+          agencyId,
+          gridId,
+          gridName,
+          gender,
+          homeId,
+          homeName,
+          name: '居民详情',
+          resiId: targetId,
+        });
+        this.$router.push({ name: "jumin-huaxiang" });
+        this.$store.state.contentTabs = this.$store.state.contentTabs.map(
+          (item) => {
+            if (item.name === "jumin-huaxiang") {
+              return { ...item, title: name };
+            }
+            return item;
+          }
+        );
+      }else if(item.msgType == "resident_category"){
+        let obj = {
+          PARTY_FLAG: '/main/communityParty-members-memberList',
+          SUBSISTENCE_ALLOWANCE_FLAG: '/main/base-residentManagement-subsistenceAllowance-subsistenceAllowance',
+          ENSURE_HOUSE_FLAG: '/main/base-residentManagement-housingNature-housingNature',
+          VETERAN_FLAG: '/main/base-residentManagement-veteran-veteran',
+          OLD_PEOPLE_FLAG: '/main/base-residentManagement-oldPeople-oldPeople',
+          SPECIAL_SUPPORT_FLAG: '/main/base-residentManagement-tefu-tefuList',
+          DISABILITY_FLAG: '/main/base-residentManagement-resiDisability-resiDisability',
+          SERIOUS_ILLNESS_FLAG: '大病',
+          CHRONIC_DISEASE_FLAG: '慢病',
+          SPECIAL_CROWD_FLAG: '特殊人群',
+        }
+        this.$router.push({
+            path: obj[item.category],
+          });
       }
+      this.getNoticeData()
     },
-
+   
     toNoticePage() {
       this.$router.push({
         path: "/main/home-notice",
       });
     },
+    jumpToJuMin() {
+      this.$router.push({
+        path: "/main/workSys-setResiUpdate-index",
+      });
+    },
+    //
+    jumpToHouse(e) {
+
+      this.$router.push({
+        path: "/main/base-community-community",
+        query: {
+          param1: e,
+        }
+      });
+    },
 
     toSearchPage(type, searchKey) {
       this.$router.push({
@@ -391,7 +552,10 @@ export default {
         this.$message.error(msg);
       }
     },
-
+    // 格式化数字
+    formatNumberWithCommas(number) {
+      return new Intl.NumberFormat().format(number);
+    },
     //加载组织数据
     async getPandectData() {
       const url = "/actual/base/residentHouseMerge/communityOverview";
@@ -405,7 +569,14 @@ export default {
       if (code === 0) {
         if (data) {
           this.pandectData = data;
+          for (let key in this.pandectData) {
+            if (!isNaN(this.pandectData[key])) {
+              // 如果值可以转换为数字，则进行格式化
+              this.pandectData[key] = this.formatNumberWithCommas(parseFloat(this.pandectData[key]));
+            }
+          }
         }
+
       } else {
         this.$message.error(msg);
       }
@@ -416,10 +587,9 @@ export default {
       const url = "/message/intelligentMessage/list";
       let params = {
         last: "10",
+        readFlag: '0'
       };
-
       const { data, code, msg } = await requestGet(url, params);
-
       if (code === 0) {
         if (data) {
           this.noticeData = data;
@@ -428,6 +598,23 @@ export default {
         this.$message.error(msg);
       }
     },
+    handelClickToResi(e){
+      this.$router.push({
+        name: "base-resi",
+        params: {
+          category: e.residentCategory || null,
+        },
+      });
+    },
+    handelCLickJump(e,type){
+      this.$router.push({
+            path: "/main/base-nonIntResi",
+            query: {
+              resiCategory: e.residentCategory,
+              type:type
+            }
+          });
+    },
 
     //加载组织数据
     async getWarningList() {
@@ -491,8 +678,103 @@ export default {
         this.$message.error(msg);
       }
     },
+    initEcharts() {
+      this.$http.get("/actual/base/residentIntegrity/resiCategoryStats/byOrg/query4Org").then(({ data: { data } }) => {
+        this.myBarchart = echarts.init(document.getElementById("myBarchart"));
+        let xData = data.categoryStatsDatas.map(item => item.resiCategoryName)
+        // let integratedNum = data.categoryStatsDatas.map(item => item.integratedNum)
+        // let nonIntegratedNum = data.categoryStatsDatas.map(item => item.nonIntegratedNum)
+        let option = {
+          backgroundColor: '#fff',
+          color: ['#448cf6', '#f7ca60',],
+          tooltip: {
+            trigger: 'axis',
+            axisPointer: {
+              type: 'shadow'
+            }
+          },
+          legend: {
+            x: 'center',
+            bottom: '8%',
+            data: ['分类信息完整数', '分类信息不完整数'],
+            icon: "rect",
+            itemWidth: 20,
+            itemHeight: 5,
+            itemGap: 20,
+          },
+          grid: { //图表的位置
+            top: '3%',
+            left: '3%',
+            right: '4%',
+            bottom: '10%',
+            containLabel: true
+          },
+          yAxis: [{
+            type: 'value',
+            splitLine: {
+              show: true,
+              lineStyle: {
+                color: ['#f2f2f2']
+              }
+            },
+          }],
+          xAxis: [{
+            type: 'category',
+            data: xData,
+            axisLabel: {
+                rotate: 50  // 设置旋转角度为45度
+            }
+          }],
+          series: [{
+            name: '分类信息完整数',
+            type: 'bar',
+            stack: '总量',
+            barWidth: '30px',
+            data: data.categoryStatsDatas.map((item, index) => ({
+              value: item.integratedNum,
+              extraProperty: item.resiCategory
+            })),
+          },
+          {
+            name: '分类信息不完整数',
+            type: 'bar',
+            stack: '总量',
+            barWidth: '30px',
+            data: data.categoryStatsDatas.map((item, index) => ({
+              value: item.nonIntegratedNum,
+              extraProperty: item.resiCategory
+            })),
+          }
+          ]
+        };
+        const resizeHandler = () => {
+            this.myBarchart.resize();
+        };
+        this.myBarchart.setOption(option);
+        window.addEventListener("resize", this.handleWindowResize);
+        window.addEventListener("resize", resizeHandler);
+        this.myBarchart.on("click", (e) => {
+          this.$router.push({
+            path: "/main/base-nonIntResi",
+            query: {
+              type:'cateNonIntegrity',
+              resiCategory: e.data.extraProperty,
+            }
+          });
+          // 
+
+        });
+      });
+    },
+
+
   },
 };
 </script>
 
 <style lang="scss" src="@/assets/scss/modules/index.scss" scoped></style>
+<style lang="scss" scoped>
+.z-on{
+  margin-left: 0 !important;
+}
+</style>
diff --git a/src/views/modules/home/notice.vue b/src/views/modules/home/notice.vue
index 50e253193..7bf0079bd 100644
--- a/src/views/modules/home/notice.vue
+++ b/src/views/modules/home/notice.vue
@@ -84,18 +84,122 @@ export default {
 		this.getList();
 	},
 	methods: {
-		handleClickNotice(item, index) {
-			console.log("zheli")
-			const { msgType, targetId } = item;
-			this.readClearOne(item)
-			if (msgType == "community_house") {
-				this.$refs.fastcall.showHouseInfo(targetId);
-			} else if (msgType == "resident_base_info") {
-				this.$refs.fastcall.showResiInfo(targetId);
+		// handleClickNotice(item, index) {
+		// 	// this.readClearOne(item);
+		// 	if (item.msgType == "community_house") {
+		// 		let { agencyId, gridId, gridName, houseId, houseName, targetId } = item
+		// 		this.$store.dispatch('saveDataH', { agencyId, gridId, gridName, houseId: targetId, houseName: '房屋详情' });
+		// 		this.$router.push({ name: 'house-huaxiang' });
+		// 		this.$store.state.contentTabs = this.$store.state.contentTabs.map(item => {
+		// 			if (item.name === "house-huaxiang") {
+		// 				return { ...item, title: '房屋信息' };
+		// 			}
+		// 			return item;
+		// 		});
+		// 	} else if (item.msgType == "resident_base_info") {
+		// 		let {
+		// 			agencyId,
+		// 			gridId,
+		// 			gridName,
+		// 			gender,
+		// 			homeId,
+		// 			homeName,
+		// 			name,
+		// 			targetId,
+		// 			deptName
+		// 		} = item;
+		// 		this.$store.dispatch("saveData", {
+		// 			agencyId,
+		// 			gridId,
+		// 			gridName,
+		// 			gender,
+		// 			homeId,
+		// 			homeName,
+		// 			name: '居民详情',
+		// 			resiId: targetId,
+		// 		});
+		// 		this.$router.push({ name: "jumin-huaxiang" });
+		// 		this.$store.state.contentTabs = this.$store.state.contentTabs.map(
+		// 			(item) => {
+		// 				if (item.name === "jumin-huaxiang") {
+		// 					return { ...item, title: name };
+		// 				}
+		// 				return item;
+		// 			}
+		// 		);
+		// 	}
+		// },
+		handleClickNotice(item) {
+			this.readClearOne(item);
+			if (item.msgType == "community_house") {
+				let { agencyId, gridId, gridName, houseId, houseName, targetId } = item
+				this.$store.dispatch('saveDataH', { agencyId, gridId, gridName, houseId: targetId, houseName: '房屋详情' });
+				this.$router.push({ name: 'house-huaxiang' });
+				this.$store.state.contentTabs = this.$store.state.contentTabs.map(item => {
+					if (item.name === "house-huaxiang") {
+						return { ...item, title: '房屋信息' };
+					}
+					return item;
+				});
+			} else if (item.msgType == "resident_base_info") {
+				let {
+					agencyId,
+					gridId,
+					gridName,
+					gender,
+					homeId,
+					homeName,
+					name,
+					targetId,
+					deptName
+				} = item;
+				this.$store.dispatch("saveData", {
+					agencyId,
+					gridId,
+					gridName,
+					gender,
+					homeId,
+					homeName,
+					name: '居民详情',
+					resiId: targetId,
+				});
+				this.$router.push({ name: "jumin-huaxiang" });
+				this.$store.state.contentTabs = this.$store.state.contentTabs.map(
+					(item) => {
+						if (item.name === "jumin-huaxiang") {
+							return { ...item, title: name };
+						}
+						return item;
+					}
+				);
+			} else if (item.msgType == "resident_category") {
+				let obj = {
+					PARTY_FLAG: '/main/communityParty-members-memberList',
+					SUBSISTENCE_ALLOWANCE_FLAG: '/main/base-residentManagement-subsistenceAllowance-subsistenceAllowance',
+					ENSURE_HOUSE_FLAG: '/main/base-residentManagement-housingNature-housingNature',
+					VETERAN_FLAG: '/main/base-residentManagement-veteran-veteran',
+					OLD_PEOPLE_FLAG: '/main/base-residentManagement-oldPeople-oldPeople',
+					SPECIAL_SUPPORT_FLAG: '/main/base-residentManagement-tefu-tefuList',
+					DISABILITY_FLAG: '/main/base-residentManagement-resiDisability-resiDisability',
+					SERIOUS_ILLNESS_FLAG: '大病',
+					CHRONIC_DISEASE_FLAG: '慢病',
+					SPECIAL_CROWD_FLAG: '特殊人群',
+				}
+				this.$router.push({
+					path: obj[item.category],
+				});
+			} else if(item.msgType == "sys_version_upgrade_publish"){
+				let {  targetId } = item
+				this.$router.push({ path: `notice-version`, query: { version_id: targetId } });
+				this.$store.state.contentTabs = this.$store.state.contentTabs.map(item => {
+					if (item.name === "notice-version") {
+						return { ...item };
+					}
+					return item;
+				});
 			}
-			this.read(item, index);
 		},
-
+		
 		async read(item, index) {
 			if (item && item.readFlag == 1) return;
 
@@ -116,13 +220,13 @@ export default {
 				this.$message.error(msg);
 			}
 		},
-		async readClearOne(item){
-			console.log("item",item)
+		async readClearOne(item) {
+			console.log("item", item)
 			const url = `/message/intelligentMessage/msg/clearOne/?msgId=${item.id}`
-			const {data,code,msg} = await requestPost(url)
-			if(code == 0){
+			const { data, code, msg } = await requestPost(url)
+			if (code == 0) {
 				this.getList()
-			}else if(code >= 8000){
+			} else if (code >= 8000) {
 				this.$message.error(msg)
 			}
 		},
diff --git a/src/views/modules/job/schedule-add-or-update.vue b/src/views/modules/job/schedule-add-or-update.vue
index dde021595..cfd3afbc3 100644
--- a/src/views/modules/job/schedule-add-or-update.vue
+++ b/src/views/modules/job/schedule-add-or-update.vue
@@ -2,16 +2,16 @@
   <el-dialog :visible.sync="visible" :title="!dataForm.id ? $t('add') : $t('update')" :close-on-click-modal="false" :close-on-press-escape="false">
     <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" label-width="120px">
       <el-form-item prop="beanName" :label="$t('schedule.beanName')">
-        <el-input v-model="dataForm.beanName" :placeholder="$t('schedule.beanNameTips')"></el-input>
+        <el-input v-model.trim="dataForm.beanName" :placeholder="$t('schedule.beanNameTips')"></el-input>
       </el-form-item>
       <el-form-item prop="params" :label="$t('schedule.params')">
-        <el-input v-model="dataForm.params" :placeholder="$t('schedule.params')"></el-input>
+        <el-input v-model.trim="dataForm.params" :placeholder="$t('schedule.params')"></el-input>
       </el-form-item>
       <el-form-item prop="cronExpression" :label="$t('schedule.cronExpression')">
-        <el-input v-model="dataForm.cronExpression" :placeholder="$t('schedule.cronExpressionTips')"></el-input>
+        <el-input v-model.trim="dataForm.cronExpression" :placeholder="$t('schedule.cronExpressionTips')"></el-input>
       </el-form-item>
       <el-form-item prop="remark"  :label="$t('schedule.remark')">
-        <el-input v-model="dataForm.remark" :placeholder="$t('schedule.remark')"></el-input>
+        <el-input v-model.trim="dataForm.remark" :placeholder="$t('schedule.remark')"></el-input>
       </el-form-item>
     </el-form>
     <template slot="footer">
diff --git a/src/views/modules/job/schedule-log.vue b/src/views/modules/job/schedule-log.vue
index 6f092c5d3..e9c73524a 100644
--- a/src/views/modules/job/schedule-log.vue
+++ b/src/views/modules/job/schedule-log.vue
@@ -2,7 +2,7 @@
   <el-dialog :visible.sync="visible" :title="$t('schedule.log')" :close-on-click-modal="false" :close-on-press-escape="false" width="75%">
     <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
       <el-form-item>
-        <el-input v-model="dataForm.jobId" :placeholder="$t('schedule.jobId')" clearable></el-input>
+        <el-input v-model.trim="dataForm.jobId" :placeholder="$t('schedule.jobId')" clearable></el-input>
       </el-form-item>
       <el-form-item>
         <el-button @click="getDataList()">{{ $t('query') }}</el-button>
diff --git a/src/views/modules/job/schedule.vue b/src/views/modules/job/schedule.vue
index b3ade11da..349bc54cc 100644
--- a/src/views/modules/job/schedule.vue
+++ b/src/views/modules/job/schedule.vue
@@ -6,7 +6,7 @@
                :model="dataForm"
                @keyup.enter.native="getDataList()">
         <el-form-item>
-          <el-input v-model="dataForm.beanName"
+          <el-input v-model.trim="dataForm.beanName"
                     :placeholder="$t('schedule.beanName')"
                     clearable></el-input>
         </el-form-item>
diff --git a/src/views/modules/message/mail-log.vue b/src/views/modules/message/mail-log.vue
index f63248b1c..188ae2573 100644
--- a/src/views/modules/message/mail-log.vue
+++ b/src/views/modules/message/mail-log.vue
@@ -3,13 +3,13 @@
     <div class="mod-message__mail-log">
       <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
         <el-form-item>
-          <el-input v-model="dataForm.templateId" :placeholder="$t('mail.templateId')" clearable></el-input>
+          <el-input v-model.trim="dataForm.templateId" :placeholder="$t('mail.templateId')" clearable></el-input>
         </el-form-item>
         <el-form-item>
-          <el-input v-model="dataForm.mailTo" :placeholder="$t('mail.mailTo')" clearable></el-input>
+          <el-input v-model.trim="dataForm.mailTo" :placeholder="$t('mail.mailTo')" clearable></el-input>
         </el-form-item>
         <el-form-item>
-          <el-select v-model="dataForm.status" :placeholder="$t('mail.status')" clearable>
+          <el-select v-model.trim="dataForm.status" :placeholder="$t('mail.status')" clearable>
             <el-option :label="$t('mail.status1')" :value="1"></el-option>
             <el-option :label="$t('mail.status0')" :value="0"></el-option>
           </el-select>
diff --git a/src/views/modules/message/mail-template-add-or-update.vue b/src/views/modules/message/mail-template-add-or-update.vue
index 762c17fc5..7c17a66ee 100644
--- a/src/views/modules/message/mail-template-add-or-update.vue
+++ b/src/views/modules/message/mail-template-add-or-update.vue
@@ -2,10 +2,10 @@
   <el-dialog :visible.sync="visible" :title="!dataForm.id ? $t('add') : $t('update')" :close-on-click-modal="false" :close-on-press-escape="false">
     <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" label-width="120px">
       <el-form-item prop="name" :label="$t('mail.name')">
-        <el-input v-model="dataForm.name" :placeholder="$t('mail.name')"></el-input>
+        <el-input v-model.trim="dataForm.name" :placeholder="$t('mail.name')"></el-input>
       </el-form-item>
       <el-form-item prop="subject" :label="$t('mail.subject')">
-        <el-input v-model="dataForm.subject" :placeholder="$t('mail.subject')"></el-input>
+        <el-input v-model.trim="dataForm.subject" :placeholder="$t('mail.subject')"></el-input>
       </el-form-item>
       <el-form-item prop="content" :label="$t('mail.content')">
         <!-- 富文本编辑器, 容器 -->
diff --git a/src/views/modules/message/mail-template-config.vue b/src/views/modules/message/mail-template-config.vue
index 2ac254634..772ec572a 100644
--- a/src/views/modules/message/mail-template-config.vue
+++ b/src/views/modules/message/mail-template-config.vue
@@ -2,16 +2,16 @@
   <el-dialog :visible.sync="visible" :title="$t('mail.config')" :close-on-click-modal="false" :close-on-press-escape="false">
     <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" label-width="120px">
       <el-form-item prop="smtp" :label="$t('mail.config')">
-        <el-input v-model="dataForm.smtp" :placeholder="$t('mail.config')"></el-input>
+        <el-input v-model.trim="dataForm.smtp" :placeholder="$t('mail.config')"></el-input>
       </el-form-item>
       <el-form-item prop="port" :label="$t('mail.port')">
-        <el-input v-model="dataForm.port" :placeholder="$t('mail.port')"></el-input>
+        <el-input v-model.trim="dataForm.port" :placeholder="$t('mail.port')"></el-input>
       </el-form-item>
       <el-form-item prop="username" :label="$t('mail.username')">
-        <el-input v-model="dataForm.username" :placeholder="$t('mail.username')"></el-input>
+        <el-input v-model.trim="dataForm.username" :placeholder="$t('mail.username')"></el-input>
       </el-form-item>
       <el-form-item prop="password" :label="$t('mail.password')">
-        <el-input v-model="dataForm.password" :placeholder="$t('mail.password')"></el-input>
+        <el-input v-model.trim="dataForm.password" :placeholder="$t('mail.password')"></el-input>
       </el-form-item>
     </el-form>
     <template slot="footer">
diff --git a/src/views/modules/message/mail-template-send.vue b/src/views/modules/message/mail-template-send.vue
index 996dd41f7..2320a764b 100644
--- a/src/views/modules/message/mail-template-send.vue
+++ b/src/views/modules/message/mail-template-send.vue
@@ -2,13 +2,13 @@
   <el-dialog :visible.sync="visible" :title="$t('mail.send')" :close-on-click-modal="false" :close-on-press-escape="false">
     <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" label-width="120px">
       <el-form-item prop="mailTo" :label="$t('mail.mailTo')">
-        <el-input v-model="dataForm.mailTo" :placeholder="$t('mail.mailTo')"></el-input>
+        <el-input v-model.trim="dataForm.mailTo" :placeholder="$t('mail.mailTo')"></el-input>
       </el-form-item>
       <el-form-item prop="mailCc" :label="$t('mail.mailCc')">
-        <el-input v-model="dataForm.mailCc" :placeholder="$t('mail.mailCc')"></el-input>
+        <el-input v-model.trim="dataForm.mailCc" :placeholder="$t('mail.mailCc')"></el-input>
       </el-form-item>
       <el-form-item prop="params" :label="$t('mail.params')">
-        <el-input v-model="dataForm.params" :placeholder="$t('mail.paramsTips')"></el-input>
+        <el-input v-model.trim="dataForm.params" :placeholder="$t('mail.paramsTips')"></el-input>
       </el-form-item>
     </el-form>
     <template slot="footer">
diff --git a/src/views/modules/message/mail-template.vue b/src/views/modules/message/mail-template.vue
index d354edf11..bc0069a92 100644
--- a/src/views/modules/message/mail-template.vue
+++ b/src/views/modules/message/mail-template.vue
@@ -3,7 +3,7 @@
     <div class="mod-message__mail-template">
       <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
         <el-form-item>
-          <el-input v-model="dataForm.name" :placeholder="$t('mail.name')" clearable></el-input>
+          <el-input v-model.trim="dataForm.name" :placeholder="$t('mail.name')" clearable></el-input>
         </el-form-item>
         <el-form-item>
           <el-button @click="getDataList()">{{ $t('query') }}</el-button>
diff --git a/src/views/modules/message/sms-config.vue b/src/views/modules/message/sms-config.vue
index d92f4eb61..a006d9532 100644
--- a/src/views/modules/message/sms-config.vue
+++ b/src/views/modules/message/sms-config.vue
@@ -2,37 +2,37 @@
   <el-dialog :visible.sync="visible" :title="$t('sms.config')" :close-on-click-modal="false" :close-on-press-escape="false">
     <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" label-width="120px">
       <el-form-item :label="$t('sms.platform')" size="mini">
-        <el-radio-group v-model="dataForm.platform">
+        <el-radio-group v-model.trim="dataForm.platform">
           <el-radio :label="1">{{ $t('sms.platform1') }}</el-radio>
           <el-radio :label="2">{{ $t('sms.platform2') }}</el-radio>
         </el-radio-group>
       </el-form-item>
       <template v-if="dataForm.platform === 1">
         <el-form-item prop="aliyunAccessKeyId" :label="$t('sms.aliyunAccessKeyId')">
-          <el-input v-model="dataForm.aliyunAccessKeyId" :placeholder="$t('sms.aliyunAccessKeyIdTips')"></el-input>
+          <el-input v-model.trim="dataForm.aliyunAccessKeyId" :placeholder="$t('sms.aliyunAccessKeyIdTips')"></el-input>
         </el-form-item>
         <el-form-item prop="aliyunAccessKeySecret" :label="$t('sms.aliyunAccessKeySecret')">
-          <el-input v-model="dataForm.aliyunAccessKeySecret" :placeholder="$t('sms.aliyunAccessKeySecretTips')"></el-input>
+          <el-input v-model.trim="dataForm.aliyunAccessKeySecret" :placeholder="$t('sms.aliyunAccessKeySecretTips')"></el-input>
         </el-form-item>
         <el-form-item prop="aliyunSignName" :label="$t('sms.aliyunSignName')">
-          <el-input v-model="dataForm.aliyunSignName" :placeholder="$t('sms.aliyunSignName')"></el-input>
+          <el-input v-model.trim="dataForm.aliyunSignName" :placeholder="$t('sms.aliyunSignName')"></el-input>
         </el-form-item>
         <el-form-item prop="aliyunTemplateCode" :label="$t('sms.aliyunTemplateCode')">
-          <el-input v-model="dataForm.aliyunTemplateCode" :placeholder="$t('sms.aliyunTemplateCodeTips')"></el-input>
+          <el-input v-model.trim="dataForm.aliyunTemplateCode" :placeholder="$t('sms.aliyunTemplateCodeTips')"></el-input>
         </el-form-item>
       </template>
       <template v-else-if="dataForm.platform === 2">
         <el-form-item prop="qcloudAppId" :label="$t('sms.qcloudAppId')">
-          <el-input v-model="dataForm.qcloudAppId" :placeholder="$t('sms.qcloudAppIdTips')"></el-input>
+          <el-input v-model.trim="dataForm.qcloudAppId" :placeholder="$t('sms.qcloudAppIdTips')"></el-input>
         </el-form-item>
         <el-form-item prop="qcloudAppKey" :label="$t('sms.qcloudAppKey')">
-          <el-input v-model="dataForm.qcloudAppKey" :placeholder="$t('sms.qcloudAppKeyTips')"></el-input>
+          <el-input v-model.trim="dataForm.qcloudAppKey" :placeholder="$t('sms.qcloudAppKeyTips')"></el-input>
         </el-form-item>
         <el-form-item prop="qcloudSignName" :label="$t('sms.qcloudSignName')">
-          <el-input v-model="dataForm.qcloudSignName" :placeholder="$t('sms.qcloudSignName')"></el-input>
+          <el-input v-model.trim="dataForm.qcloudSignName" :placeholder="$t('sms.qcloudSignName')"></el-input>
         </el-form-item>
         <el-form-item prop="qcloudTemplateId" :label="$t('sms.qcloudTemplateId')">
-          <el-input v-model="dataForm.qcloudTemplateId" :placeholder="$t('sms.qcloudTemplateIdTips')"></el-input>
+          <el-input v-model.trim="dataForm.qcloudTemplateId" :placeholder="$t('sms.qcloudTemplateIdTips')"></el-input>
         </el-form-item>
       </template>
     </el-form>
diff --git a/src/views/modules/message/sms-send.vue b/src/views/modules/message/sms-send.vue
index be42941b7..96e7017ec 100644
--- a/src/views/modules/message/sms-send.vue
+++ b/src/views/modules/message/sms-send.vue
@@ -2,10 +2,10 @@
   <el-dialog :visible.sync="visible" :title="$t('sms.send')" :close-on-click-modal="false" :close-on-press-escape="false">
     <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" label-width="120px">
       <el-form-item prop="mobile" :label="$t('sms.mobile')">
-        <el-input v-model="dataForm.mobile" :placeholder="$t('sms.mobile')"></el-input>
+        <el-input v-model.trim="dataForm.mobile" :placeholder="$t('sms.mobile')"></el-input>
       </el-form-item>
       <el-form-item prop="params" :label="$t('sms.params')">
-        <el-input v-model="dataForm.params" :placeholder="$t('sms.paramsTips')"></el-input>
+        <el-input v-model.trim="dataForm.params" :placeholder="$t('sms.paramsTips')"></el-input>
       </el-form-item>
     </el-form>
     <template slot="footer">
diff --git a/src/views/modules/message/sms.vue b/src/views/modules/message/sms.vue
index 83e2aca23..77228a2b2 100644
--- a/src/views/modules/message/sms.vue
+++ b/src/views/modules/message/sms.vue
@@ -3,10 +3,10 @@
     <div class="mod-message__sms">
       <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
         <el-form-item>
-          <el-input v-model="dataForm.mobile" :placeholder="$t('sms.mobile')" clearable></el-input>
+          <el-input v-model.trim="dataForm.mobile" :placeholder="$t('sms.mobile')" clearable></el-input>
         </el-form-item>
         <el-form-item>
-          <el-select v-model="dataForm.status" :placeholder="$t('sms.status')" clearable>
+          <el-select v-model.trim="dataForm.status" :placeholder="$t('sms.status')" clearable>
             <el-option :label="$t('sms.status1')" :value="1"></el-option>
             <el-option :label="$t('sms.status0')" :value="0"></el-option>
           </el-select>
diff --git a/src/views/modules/operationReport/strangeraccessrecord-add-or-update.vue b/src/views/modules/operationReport/strangeraccessrecord-add-or-update.vue
index 92521dc7b..8d849602f 100644
--- a/src/views/modules/operationReport/strangeraccessrecord-add-or-update.vue
+++ b/src/views/modules/operationReport/strangeraccessrecord-add-or-update.vue
@@ -2,46 +2,46 @@
   <el-dialog :visible.sync="visible" :title="!dataForm.id ? $t('add') : $t('update')" :close-on-click-modal="false" :close-on-press-escape="false">
     <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" :label-width="$i18n.locale === 'en-US' ? '120px' : '80px'">
           <el-form-item label="定位地区编码 (用户允许获取位置)" prop="locationAreaCode">
-          <el-input v-model="dataForm.locationAreaCode" placeholder="定位地区编码 (用户允许获取位置)"></el-input>
+          <el-input v-model.trim="dataForm.locationAreaCode" placeholder="定位地区编码 (用户允许获取位置)"></el-input>
       </el-form-item>
           <el-form-item label="选择地区编码 (用户选择地区位置" prop="lelectedAreaCode">
-          <el-input v-model="dataForm.lelectedAreaCode" placeholder="选择地区编码 (用户选择地区位置"></el-input>
+          <el-input v-model.trim="dataForm.lelectedAreaCode" placeholder="选择地区编码 (用户选择地区位置"></el-input>
       </el-form-item>
           <el-form-item label="省份" prop="province">
-          <el-input v-model="dataForm.province" placeholder="省份"></el-input>
+          <el-input v-model.trim="dataForm.province" placeholder="省份"></el-input>
       </el-form-item>
           <el-form-item label="城市" prop="city">
-          <el-input v-model="dataForm.city" placeholder="城市"></el-input>
+          <el-input v-model.trim="dataForm.city" placeholder="城市"></el-input>
       </el-form-item>
           <el-form-item label="城市" prop="area">
-          <el-input v-model="dataForm.area" placeholder="城市"></el-input>
+          <el-input v-model.trim="dataForm.area" placeholder="城市"></el-input>
       </el-form-item>
           <el-form-item label="是否首次位置授权(0:是 1:否)" prop="isAuthorized">
-          <el-input v-model="dataForm.isAuthorized" placeholder="是否首次位置授权(0:是 1:否)"></el-input>
+          <el-input v-model.trim="dataForm.isAuthorized" placeholder="是否首次位置授权(0:是 1:否)"></el-input>
       </el-form-item>
           <el-form-item label="网格数 根据位置查询到的附近网格数" prop="gridNumber">
-          <el-input v-model="dataForm.gridNumber" placeholder="网格数 根据位置查询到的附近网格数"></el-input>
+          <el-input v-model.trim="dataForm.gridNumber" placeholder="网格数 根据位置查询到的附近网格数"></el-input>
       </el-form-item>
           <el-form-item label="访问时间 访问的当前时间" prop="visitTime">
-          <el-input v-model="dataForm.visitTime" placeholder="访问时间 访问的当前时间"></el-input>
+          <el-input v-model.trim="dataForm.visitTime" placeholder="访问时间 访问的当前时间"></el-input>
       </el-form-item>
           <el-form-item label="删除标识：0.未删除 1.已删除" prop="delFlag">
-          <el-input v-model="dataForm.delFlag" placeholder="删除标识：0.未删除 1.已删除"></el-input>
+          <el-input v-model.trim="dataForm.delFlag" placeholder="删除标识：0.未删除 1.已删除"></el-input>
       </el-form-item>
           <el-form-item label="乐观锁" prop="revision">
-          <el-input v-model="dataForm.revision" placeholder="乐观锁"></el-input>
+          <el-input v-model.trim="dataForm.revision" placeholder="乐观锁"></el-input>
       </el-form-item>
           <el-form-item label="创建人" prop="createdBy">
-          <el-input v-model="dataForm.createdBy" placeholder="创建人"></el-input>
+          <el-input v-model.trim="dataForm.createdBy" placeholder="创建人"></el-input>
       </el-form-item>
           <el-form-item label="创建时间" prop="createdTime">
-          <el-input v-model="dataForm.createdTime" placeholder="创建时间"></el-input>
+          <el-input v-model.trim="dataForm.createdTime" placeholder="创建时间"></el-input>
       </el-form-item>
           <el-form-item label="更新人" prop="updatedBy">
-          <el-input v-model="dataForm.updatedBy" placeholder="更新人"></el-input>
+          <el-input v-model.trim="dataForm.updatedBy" placeholder="更新人"></el-input>
       </el-form-item>
           <el-form-item label="更新时间" prop="updatedTime">
-          <el-input v-model="dataForm.updatedTime" placeholder="更新时间"></el-input>
+          <el-input v-model.trim="dataForm.updatedTime" placeholder="更新时间"></el-input>
       </el-form-item>
       </el-form>
     <template slot="footer">
diff --git a/src/views/modules/operationReport/strangeraccessrecord.vue b/src/views/modules/operationReport/strangeraccessrecord.vue
index 482091ba2..d3b83f15f 100644
--- a/src/views/modules/operationReport/strangeraccessrecord.vue
+++ b/src/views/modules/operationReport/strangeraccessrecord.vue
@@ -6,7 +6,7 @@
                :model="dataForm"
                @keyup.enter.native="getDataList()">
         <!--        <el-form-item>
-          <el-input v-model="dataForm.id" placeholder="id" clearable></el-input>
+          <el-input v-model.trim="dataForm.id" placeholder="id" clearable></el-input>
         </el-form-item>
         <el-form-item>
           <el-button @click="getDataList()">{{ $t('query') }}</el-button>
diff --git a/src/views/modules/oss/oss-config.vue b/src/views/modules/oss/oss-config.vue
index ae6ef96c2..eafedb828 100644
--- a/src/views/modules/oss/oss-config.vue
+++ b/src/views/modules/oss/oss-config.vue
@@ -2,7 +2,7 @@
   <el-dialog :visible.sync="visible" :title="$t('oss.config')" :close-on-click-modal="false" :close-on-press-escape="false">
     <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" label-width="120px">
       <el-form-item :label="$t('oss.type')" size="mini">
-        <el-radio-group v-model="dataForm.type">
+        <el-radio-group v-model.trim="dataForm.type">
           <el-radio :label="1">{{ $t('oss.type1') }}</el-radio>
           <el-radio :label="2">{{ $t('oss.type2') }}</el-radio>
           <el-radio :label="3">{{ $t('oss.type3') }}</el-radio>
@@ -12,62 +12,62 @@
       </el-form-item>
       <template v-if="dataForm.type === 1">
         <el-form-item prop="qiniuDomain" :label="$t('oss.qiniuDomain')">
-          <el-input v-model="dataForm.qiniuDomain" :placeholder="$t('oss.qiniuDomainTips')"></el-input>
+          <el-input v-model.trim="dataForm.qiniuDomain" :placeholder="$t('oss.qiniuDomainTips')"></el-input>
         </el-form-item>
         <el-form-item prop="qiniuPrefix" :label="$t('oss.qiniuPrefix')">
-          <el-input v-model="dataForm.qiniuPrefix" :placeholder="$t('oss.qiniuPrefixTips')"></el-input>
+          <el-input v-model.trim="dataForm.qiniuPrefix" :placeholder="$t('oss.qiniuPrefixTips')"></el-input>
         </el-form-item>
         <el-form-item prop="qiniuAccessKey" :label="$t('oss.qiniuAccessKey')">
-          <el-input v-model="dataForm.qiniuAccessKey" :placeholder="$t('oss.qiniuAccessKeyTips')"></el-input>
+          <el-input v-model.trim="dataForm.qiniuAccessKey" :placeholder="$t('oss.qiniuAccessKeyTips')"></el-input>
         </el-form-item>
         <el-form-item prop="qiniuSecretKey" :label="$t('oss.qiniuSecretKey')">
-          <el-input v-model="dataForm.qiniuSecretKey" :placeholder="$t('oss.qiniuSecretKeyTips')"></el-input>
+          <el-input v-model.trim="dataForm.qiniuSecretKey" :placeholder="$t('oss.qiniuSecretKeyTips')"></el-input>
         </el-form-item>
         <el-form-item prop="qiniuBucketName" :label="$t('oss.qiniuBucketName')">
-          <el-input v-model="dataForm.qiniuBucketName" :placeholder="$t('oss.qiniuBucketNameTips')"></el-input>
+          <el-input v-model.trim="dataForm.qiniuBucketName" :placeholder="$t('oss.qiniuBucketNameTips')"></el-input>
         </el-form-item>
       </template>
       <template v-else-if="dataForm.type === 2">
         <el-form-item prop="aliyunDomain" :label="$t('oss.aliyunDomain')">
-          <el-input v-model="dataForm.aliyunDomain" :placeholder="$t('oss.aliyunDomainTips')"></el-input>
+          <el-input v-model.trim="dataForm.aliyunDomain" :placeholder="$t('oss.aliyunDomainTips')"></el-input>
         </el-form-item>
         <el-form-item prop="aliyunPrefix" :label="$t('oss.aliyunPrefix')">
-          <el-input v-model="dataForm.aliyunPrefix" :placeholder="$t('oss.aliyunPrefixTips')"></el-input>
+          <el-input v-model.trim="dataForm.aliyunPrefix" :placeholder="$t('oss.aliyunPrefixTips')"></el-input>
         </el-form-item>
         <el-form-item prop="aliyunEndPoint" :label="$t('oss.aliyunEndPoint')">
-          <el-input v-model="dataForm.aliyunEndPoint" :placeholder="$t('oss.aliyunEndPointTips')"></el-input>
+          <el-input v-model.trim="dataForm.aliyunEndPoint" :placeholder="$t('oss.aliyunEndPointTips')"></el-input>
         </el-form-item>
         <el-form-item prop="aliyunAccessKeyId" :label="$t('oss.aliyunAccessKeyId')">
-          <el-input v-model="dataForm.aliyunAccessKeyId" :placeholder="$t('oss.aliyunAccessKeyIdTips')"></el-input>
+          <el-input v-model.trim="dataForm.aliyunAccessKeyId" :placeholder="$t('oss.aliyunAccessKeyIdTips')"></el-input>
         </el-form-item>
         <el-form-item prop="aliyunAccessKeySecret" :label="$t('oss.aliyunAccessKeySecret')">
-          <el-input v-model="dataForm.aliyunAccessKeySecret" :placeholder="$t('oss.aliyunAccessKeySecretTips')"></el-input>
+          <el-input v-model.trim="dataForm.aliyunAccessKeySecret" :placeholder="$t('oss.aliyunAccessKeySecretTips')"></el-input>
         </el-form-item>
         <el-form-item prop="aliyunBucketName" :label="$t('oss.aliyunBucketName')">
-          <el-input v-model="dataForm.aliyunBucketName" :placeholder="$t('oss.aliyunBucketNameTips')"></el-input>
+          <el-input v-model.trim="dataForm.aliyunBucketName" :placeholder="$t('oss.aliyunBucketNameTips')"></el-input>
         </el-form-item>
       </template>
       <template v-else-if="dataForm.type === 3">
         <el-form-item prop="qcloudDomain" :label="$t('oss.qcloudDomain')">
-          <el-input v-model="dataForm.qcloudDomain" :placeholder="$t('oss.qcloudDomainTips')"></el-input>
+          <el-input v-model.trim="dataForm.qcloudDomain" :placeholder="$t('oss.qcloudDomainTips')"></el-input>
         </el-form-item>
         <el-form-item prop="qcloudPrefix" :label="$t('oss.qcloudPrefix')">
-          <el-input v-model="dataForm.qcloudPrefix" :placeholder="$t('oss.qcloudPrefixTips')"></el-input>
+          <el-input v-model.trim="dataForm.qcloudPrefix" :placeholder="$t('oss.qcloudPrefixTips')"></el-input>
         </el-form-item>
         <el-form-item prop="qcloudAppId" :label="$t('oss.qcloudAppId')">
-          <el-input v-model="dataForm.qcloudAppId" :placeholder="$t('oss.qcloudAppIdTips')"></el-input>
+          <el-input v-model.trim="dataForm.qcloudAppId" :placeholder="$t('oss.qcloudAppIdTips')"></el-input>
         </el-form-item>
         <el-form-item prop="qcloudSecretId" :label="$t('oss.qcloudSecretId')">
-          <el-input v-model="dataForm.qcloudSecretId" :placeholder="$t('oss.qcloudSecretIdTips')"></el-input>
+          <el-input v-model.trim="dataForm.qcloudSecretId" :placeholder="$t('oss.qcloudSecretIdTips')"></el-input>
         </el-form-item>
         <el-form-item prop="qcloudSecretKey" :label="$t('oss.qcloudSecretKey')">
-          <el-input v-model="dataForm.qcloudSecretKey" :placeholder="$t('oss.qcloudSecretKeyTips')"></el-input>
+          <el-input v-model.trim="dataForm.qcloudSecretKey" :placeholder="$t('oss.qcloudSecretKeyTips')"></el-input>
         </el-form-item>
         <el-form-item prop="qcloudBucketName" :label="$t('oss.qcloudBucketName')">
-          <el-input v-model="dataForm.qcloudBucketName" :placeholder="$t('oss.qcloudBucketNameTips')"></el-input>
+          <el-input v-model.trim="dataForm.qcloudBucketName" :placeholder="$t('oss.qcloudBucketNameTips')"></el-input>
         </el-form-item>
         <el-form-item prop="qcloudRegion" :label="$t('oss.qcloudRegion')">
-          <el-select v-model="dataForm.qcloudRegion" clearable :placeholder="$t('oss.qcloudRegionTips')" class="w-percent-100">
+          <el-select v-model.trim="dataForm.qcloudRegion" clearable :placeholder="$t('oss.qcloudRegionTips')" class="w-percent-100">
             <el-option value="ap-beijing-1" :label="$t('oss.qcloudRegionBeijing1')"></el-option>
             <el-option value="ap-beijing" :label="$t('oss.qcloudRegionBeijing')"></el-option>
             <el-option value="ap-shanghai" :label="$t('oss.qcloudRegionShanghai')"></el-option>
@@ -83,18 +83,18 @@
       </template>
       <template v-else-if="dataForm.type === 4">
         <el-form-item prop="fastdfsDomain" :label="$t('oss.fastdfsDomain')">
-          <el-input v-model="dataForm.fastdfsDomain" :placeholder="$t('oss.fastdfsDomainTips')"></el-input>
+          <el-input v-model.trim="dataForm.fastdfsDomain" :placeholder="$t('oss.fastdfsDomainTips')"></el-input>
         </el-form-item>
       </template>
       <template v-else-if="dataForm.type === 5">
         <el-form-item prop="localDomain" :label="$t('oss.localDomain')">
-          <el-input v-model="dataForm.localDomain" :placeholder="$t('oss.localDomainTips')"></el-input>
+          <el-input v-model.trim="dataForm.localDomain" :placeholder="$t('oss.localDomainTips')"></el-input>
         </el-form-item>
         <el-form-item prop="localPrefix" :label="$t('oss.localPrefix')">
-          <el-input v-model="dataForm.localPrefix" :placeholder="$t('oss.localPrefixTips')"></el-input>
+          <el-input v-model.trim="dataForm.localPrefix" :placeholder="$t('oss.localPrefixTips')"></el-input>
         </el-form-item>
         <el-form-item prop="localPath" :label="$t('oss.localPath')">
-          <el-input v-model="dataForm.localPath" :placeholder="$t('oss.localPathTips')"></el-input>
+          <el-input v-model.trim="dataForm.localPath" :placeholder="$t('oss.localPathTips')"></el-input>
         </el-form-item>
       </template>
     </el-form>
diff --git a/src/views/modules/partner/app/edit.vue b/src/views/modules/partner/app/edit.vue
index 7c4d967e0..3fa710e74 100644
--- a/src/views/modules/partner/app/edit.vue
+++ b/src/views/modules/partner/app/edit.vue
@@ -12,21 +12,21 @@
       <el-form-item label="应用名称"
                     prop="appName">
         <el-input class="item_width_1"
-                  v-model="dataForm.appName"
+                  v-model.trim="dataForm.appName"
                   placeholder="应用名称"></el-input>
       </el-form-item>
 
       <el-form-item label="所属客户"
                     prop="customerId">
         <div>
-          <el-radio-group v-model="dataForm.customerType"
+          <el-radio-group v-model.trim="dataForm.customerType"
                           @change="onSelectedCustomerTypeChange">
             <el-radio label="external">外部客户</el-radio>
             <el-radio label="internal">内部客户</el-radio>
           </el-radio-group>
         </div>
         <el-select class="item_width_1"
-                   v-model="dataForm.customerId"
+                   v-model.trim="dataForm.customerId"
                    placeholder="请选择"
                    clearable>
           <el-option v-for="item in customerList"
diff --git a/src/views/modules/partner/app/index.vue b/src/views/modules/partner/app/index.vue
index 4eac9e1f4..172c2d960 100644
--- a/src/views/modules/partner/app/index.vue
+++ b/src/views/modules/partner/app/index.vue
@@ -11,7 +11,7 @@
         <el-form-item label="所属客户"
                       prop="customerId">
           <div>
-            <el-radio-group v-model="tableParams.customerType"
+            <el-radio-group v-model.trim="tableParams.customerType"
                             @change="onSelectedCustomerTypeChange">
               <el-radio label="external">外部客户</el-radio>
               <el-radio label="internal">内部客户</el-radio>
@@ -21,7 +21,7 @@
         </el-form-item>
         <el-form-item>
           <el-select class="item_width_1"
-                     v-model="tableParams.customerId"
+                     v-model.trim="tableParams.customerId"
                      placeholder="请选择"
                      clearable>
             <el-option v-for="item in customerList"
diff --git a/src/views/modules/partner/edit.vue b/src/views/modules/partner/edit.vue
index 56abf8a7b..91eb8c57b 100644
--- a/src/views/modules/partner/edit.vue
+++ b/src/views/modules/partner/edit.vue
@@ -12,7 +12,7 @@
       <el-form-item label="客户名称"
                     prop="customerName">
         <el-input class="item_width_1"
-                  v-model="dataForm.customerName"
+                  v-model.trim="dataForm.customerName"
                   placeholder="客户名称"></el-input>
       </el-form-item>
     </el-form>
diff --git a/src/views/modules/partymember/icpartymemberpayrecord-add-or-update.vue b/src/views/modules/partymember/icpartymemberpayrecord-add-or-update.vue
index ef39f37e8..c7b22065d 100644
--- a/src/views/modules/partymember/icpartymemberpayrecord-add-or-update.vue
+++ b/src/views/modules/partymember/icpartymemberpayrecord-add-or-update.vue
@@ -2,40 +2,40 @@
   <el-dialog :visible.sync="visible" :title="!dataForm.id ? $t('add') : $t('update')" :close-on-click-modal="false" :close-on-press-escape="false">
     <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" :label-width="$i18n.locale === 'en-US' ? '120px' : '80px'">
           <el-form-item label="客户Id (customer.id)" prop="customerId">
-          <el-input v-model="dataForm.customerId" placeholder="客户Id (customer.id)"></el-input>
+          <el-input v-model.trim="dataForm.customerId" placeholder="客户Id (customer.id)"></el-input>
       </el-form-item>
           <el-form-item label="党员ID" prop="partyMemberId">
-          <el-input v-model="dataForm.partyMemberId" placeholder="党员ID"></el-input>
+          <el-input v-model.trim="dataForm.partyMemberId" placeholder="党员ID"></el-input>
       </el-form-item>
           <el-form-item label="缴费日期" prop="payDate">
-          <el-input v-model="dataForm.payDate" placeholder="缴费日期"></el-input>
+          <el-input v-model.trim="dataForm.payDate" placeholder="缴费日期"></el-input>
       </el-form-item>
           <el-form-item label="缴费金额" prop="money">
-          <el-input v-model="dataForm.money" placeholder="缴费金额"></el-input>
+          <el-input v-model.trim="dataForm.money" placeholder="缴费金额"></el-input>
       </el-form-item>
           <el-form-item label="缴费开始时间" prop="startDate">
-          <el-input v-model="dataForm.startDate" placeholder="缴费开始时间"></el-input>
+          <el-input v-model.trim="dataForm.startDate" placeholder="缴费开始时间"></el-input>
       </el-form-item>
           <el-form-item label="缴费结束时间" prop="endDate">
-          <el-input v-model="dataForm.endDate" placeholder="缴费结束时间"></el-input>
+          <el-input v-model.trim="dataForm.endDate" placeholder="缴费结束时间"></el-input>
       </el-form-item>
           <el-form-item label="删除标识：0.未删除 1.已删除" prop="delFlag">
-          <el-input v-model="dataForm.delFlag" placeholder="删除标识：0.未删除 1.已删除"></el-input>
+          <el-input v-model.trim="dataForm.delFlag" placeholder="删除标识：0.未删除 1.已删除"></el-input>
       </el-form-item>
           <el-form-item label="乐观锁" prop="revision">
-          <el-input v-model="dataForm.revision" placeholder="乐观锁"></el-input>
+          <el-input v-model.trim="dataForm.revision" placeholder="乐观锁"></el-input>
       </el-form-item>
           <el-form-item label="创建人" prop="createdBy">
-          <el-input v-model="dataForm.createdBy" placeholder="创建人"></el-input>
+          <el-input v-model.trim="dataForm.createdBy" placeholder="创建人"></el-input>
       </el-form-item>
           <el-form-item label="创建时间" prop="createdTime">
-          <el-input v-model="dataForm.createdTime" placeholder="创建时间"></el-input>
+          <el-input v-model.trim="dataForm.createdTime" placeholder="创建时间"></el-input>
       </el-form-item>
           <el-form-item label="更新人" prop="updatedBy">
-          <el-input v-model="dataForm.updatedBy" placeholder="更新人"></el-input>
+          <el-input v-model.trim="dataForm.updatedBy" placeholder="更新人"></el-input>
       </el-form-item>
           <el-form-item label="更新时间" prop="updatedTime">
-          <el-input v-model="dataForm.updatedTime" placeholder="更新时间"></el-input>
+          <el-input v-model.trim="dataForm.updatedTime" placeholder="更新时间"></el-input>
       </el-form-item>
       </el-form>
     <template slot="footer">
diff --git a/src/views/modules/partymember/icpartymemberpayrecord.vue b/src/views/modules/partymember/icpartymemberpayrecord.vue
index 94ea3b089..b875989bb 100644
--- a/src/views/modules/partymember/icpartymemberpayrecord.vue
+++ b/src/views/modules/partymember/icpartymemberpayrecord.vue
@@ -3,7 +3,7 @@
     <div class="mod-partymember__icPartyMemberPayRecord}">
       <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
         <el-form-item>
-          <el-input v-model="dataForm.id" placeholder="id" clearable></el-input>
+          <el-input v-model.trim="dataForm.id" placeholder="id" clearable></el-input>
         </el-form-item>
         <el-form-item>
           <el-button @click="getDataList()">{{ $t('query') }}</el-button>
diff --git a/src/views/modules/partymember/icpartymemberpayrecorddetail-add-or-update.vue b/src/views/modules/partymember/icpartymemberpayrecorddetail-add-or-update.vue
index dcc0a8e5f..63334d258 100644
--- a/src/views/modules/partymember/icpartymemberpayrecorddetail-add-or-update.vue
+++ b/src/views/modules/partymember/icpartymemberpayrecorddetail-add-or-update.vue
@@ -2,40 +2,40 @@
   <el-dialog :visible.sync="visible" :title="!dataForm.id ? $t('add') : $t('update')" :close-on-click-modal="false" :close-on-press-escape="false">
     <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" :label-width="$i18n.locale === 'en-US' ? '120px' : '80px'">
           <el-form-item label="客户Id (customer.id)" prop="customerId">
-          <el-input v-model="dataForm.customerId" placeholder="客户Id (customer.id)"></el-input>
+          <el-input v-model.trim="dataForm.customerId" placeholder="客户Id (customer.id)"></el-input>
       </el-form-item>
           <el-form-item label="党员ID" prop="partyMemberId">
-          <el-input v-model="dataForm.partyMemberId" placeholder="党员ID"></el-input>
+          <el-input v-model.trim="dataForm.partyMemberId" placeholder="党员ID"></el-input>
       </el-form-item>
           <el-form-item label="党员缴费记录表ID" prop="recordId">
-          <el-input v-model="dataForm.recordId" placeholder="党员缴费记录表ID"></el-input>
+          <el-input v-model.trim="dataForm.recordId" placeholder="党员缴费记录表ID"></el-input>
       </el-form-item>
           <el-form-item label="缴费年度" prop="year">
-          <el-input v-model="dataForm.year" placeholder="缴费年度"></el-input>
+          <el-input v-model.trim="dataForm.year" placeholder="缴费年度"></el-input>
       </el-form-item>
           <el-form-item label="缴费季度" prop="quarter">
-          <el-input v-model="dataForm.quarter" placeholder="缴费季度"></el-input>
+          <el-input v-model.trim="dataForm.quarter" placeholder="缴费季度"></el-input>
       </el-form-item>
           <el-form-item label="缴费金额" prop="money">
-          <el-input v-model="dataForm.money" placeholder="缴费金额"></el-input>
+          <el-input v-model.trim="dataForm.money" placeholder="缴费金额"></el-input>
       </el-form-item>
           <el-form-item label="删除标识：0.未删除 1.已删除" prop="delFlag">
-          <el-input v-model="dataForm.delFlag" placeholder="删除标识：0.未删除 1.已删除"></el-input>
+          <el-input v-model.trim="dataForm.delFlag" placeholder="删除标识：0.未删除 1.已删除"></el-input>
       </el-form-item>
           <el-form-item label="乐观锁" prop="revision">
-          <el-input v-model="dataForm.revision" placeholder="乐观锁"></el-input>
+          <el-input v-model.trim="dataForm.revision" placeholder="乐观锁"></el-input>
       </el-form-item>
           <el-form-item label="创建人" prop="createdBy">
-          <el-input v-model="dataForm.createdBy" placeholder="创建人"></el-input>
+          <el-input v-model.trim="dataForm.createdBy" placeholder="创建人"></el-input>
       </el-form-item>
           <el-form-item label="创建时间" prop="createdTime">
-          <el-input v-model="dataForm.createdTime" placeholder="创建时间"></el-input>
+          <el-input v-model.trim="dataForm.createdTime" placeholder="创建时间"></el-input>
       </el-form-item>
           <el-form-item label="更新人" prop="updatedBy">
-          <el-input v-model="dataForm.updatedBy" placeholder="更新人"></el-input>
+          <el-input v-model.trim="dataForm.updatedBy" placeholder="更新人"></el-input>
       </el-form-item>
           <el-form-item label="更新时间" prop="updatedTime">
-          <el-input v-model="dataForm.updatedTime" placeholder="更新时间"></el-input>
+          <el-input v-model.trim="dataForm.updatedTime" placeholder="更新时间"></el-input>
       </el-form-item>
       </el-form>
     <template slot="footer">
diff --git a/src/views/modules/partymember/icpartymemberpayrecorddetail.vue b/src/views/modules/partymember/icpartymemberpayrecorddetail.vue
index c80ff32e8..eb4aea33b 100644
--- a/src/views/modules/partymember/icpartymemberpayrecorddetail.vue
+++ b/src/views/modules/partymember/icpartymemberpayrecorddetail.vue
@@ -5,7 +5,7 @@
       <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
         <el-form-item  prop="mySelectOrg" label="所属党组织">
           <!-- <el-cascader
-                  v-model="mySelectOrg"
+                  v-model.trim="mySelectOrg"
                   :options="orgList"
                   placeholder="请选择党组织"
                   :props="{ label: 'partyOrgName', value: 'id' }"
@@ -14,7 +14,7 @@
           <el-cascader
             class="list_item_width_1"
             size="small"
-            v-model="mySelectOrg"
+            v-model.trim="mySelectOrg"
             :options="orgList"
             placeholder="请选择党组织"
             :props="{
@@ -29,7 +29,7 @@
         </el-form-item>
         <el-form-item label="姓名"
                       prop="name">
-          <el-input v-model="dataForm.name"
+          <el-input v-model.trim="dataForm.name"
                     size="small"
                     class="list_item_width_1"
                     clearable
@@ -38,7 +38,7 @@
         </el-form-item>
         <el-form-item label="证件号"
                       prop="idCard">
-          <el-input v-model="dataForm.idCard"
+          <el-input v-model.trim="dataForm.idCard"
                     size="small"
                     class="list_item_width_1"
                     clearable
@@ -47,7 +47,7 @@
         </el-form-item>
         <el-form-item label="联系电话"
                       prop="mobile">
-          <el-input v-model="dataForm.mobile"
+          <el-input v-model.trim="dataForm.mobile"
                     size="small"
                     class="list_item_width_1"
                     clearable
@@ -57,7 +57,7 @@
         <br/>
         <el-form-item label="缴费年度" prop="year">
           <el-date-picker
-                  v-model="dataForm.year"
+                  v-model.trim="dataForm.year"
                   type="year"
                   size="small"
                   placeholder="选择年"
@@ -66,7 +66,7 @@
           </el-date-picker>
         </el-form-item>
         <el-form-item label="" prop="month">
-          <el-select v-model="dataForm.month" placeholder="选择月份" size="small" clearable :disabled="dataForm.year === '' || dataForm.year === null">
+          <el-select v-model.trim="dataForm.month" placeholder="选择月份" size="small" clearable :disabled="dataForm.year === '' || dataForm.year === null">
             <el-option v-for="item in monthArr" :key="item.dictValue" :label="item.dictName" :value="item.dictValue">
             </el-option>
           </el-select>
diff --git a/src/views/modules/partymember/icpartymemberpoint.vue b/src/views/modules/partymember/icpartymemberpoint.vue
index 0257fa1d5..787a4ae86 100644
--- a/src/views/modules/partymember/icpartymemberpoint.vue
+++ b/src/views/modules/partymember/icpartymemberpoint.vue
@@ -11,7 +11,7 @@
         <el-form-item prop="mySelectOrg" label="所属党组织">
           <el-cascader
             class="list_item_width_1"
-            v-model="mySelectOrg"
+            v-model.trim="mySelectOrg"
             size="small"
             :options="orgList"
             placeholder="请选择党组织"
@@ -27,7 +27,7 @@
         </el-form-item>
         <el-form-item label="姓名" prop="name">
           <el-input
-            v-model="dataForm.name"
+            v-model.trim="dataForm.name"
             size="small"
             class="list_item_width_1"
             clearable
@@ -37,7 +37,7 @@
         </el-form-item>
         <el-form-item label="联系电话" prop="mobile">
           <el-input
-            v-model="dataForm.mobile"
+            v-model.trim="dataForm.mobile"
             size="small"
             class="list_item_width_1"
             clearable
@@ -47,7 +47,7 @@
         </el-form-item>
         <el-form-item label="证件号" prop="idCard">
           <el-input
-            v-model="dataForm.idCard"
+            v-model.trim="dataForm.idCard"
             size="small"
             class="list_item_width_1"
             clearable
@@ -59,7 +59,7 @@
         <el-form-item label="评分年度" prop="year">
           <el-date-picker
             class="list_item_width_1"
-            v-model="dataForm.year"
+            v-model.trim="dataForm.year"
             type="year"
             size="small"
             placeholder="选择年"
diff --git a/src/views/modules/partymember/icpartyorg-add-or-update.vue b/src/views/modules/partymember/icpartyorg-add-or-update.vue
index 06c1beea3..f6be5aaf4 100644
--- a/src/views/modules/partymember/icpartyorg-add-or-update.vue
+++ b/src/views/modules/partymember/icpartyorg-add-or-update.vue
@@ -12,7 +12,7 @@
       <el-form-item prop="partyOrgType"
                     label="党组织类型">
         <el-select :disabled="dataForm.id || dataForm.orgId ? true : false"
-                   v-model="dataForm.partyOrgType"
+                   v-model.trim="dataForm.partyOrgType"
                    @change="changePartyOrgType"
                    clearable
                    placeholder="请选择党组织类型">
@@ -25,13 +25,13 @@
       </el-form-item>
       <el-form-item prop="partyOrgName"
                     label="党组织名称">
-        <el-input v-model="dataForm.partyOrgName"
+        <el-input v-model.trim="dataForm.partyOrgName"
                   placeholder="请输入党组织名称"
                   style="width: 300px"></el-input>
       </el-form-item>
       <el-form-item label="党组织编码"
                     prop="partyOrgCode">
-        <el-input v-model="dataForm.partyOrgCode"
+        <el-input v-model.trim="dataForm.partyOrgCode"
                   placeholder="党组织编码"
                   style="width: 300px"></el-input>
       </el-form-item>
@@ -39,7 +39,7 @@
                     prop="agencyId"
                     label="行政组织">
         <el-cascader style="width: 300px"
-                     v-model="dataForm.agencyId"
+                     v-model.trim="dataForm.agencyId"
                      :options="agencyOrgList"
                      placeholder="请选择行政组织"
                      :props="{
@@ -59,7 +59,7 @@
                     label="上级党组织">
         <el-cascader ref="myOrg"
                      style="width: 300px"
-                     v-model="dataForm.mySelectOrg"
+                     v-model.trim="dataForm.mySelectOrg"
                      :options="orgList"
                      placeholder="请选择上级党组织"
                      :props="{
@@ -75,13 +75,13 @@
       <el-form-item v-if="dataForm.sjdzzName"
                     label="上级党组织">
         <el-input :disabled="true"
-                  v-model="dataForm.sjdzzName"
+                  v-model.trim="dataForm.sjdzzName"
                   style="width: 300px"></el-input>
       </el-form-item>
       <el-form-item label="党组织介绍"
                     prop="introduction">
         <el-input style="width: 300px"
-                  v-model="dataForm.introduction"
+                  v-model.trim="dataForm.introduction"
                   type="textarea"
                   maxlength="500"
                   placeholder="党组织介绍"></el-input>
@@ -90,7 +90,7 @@
                     prop="longitude"
                     style="display: block">
         <div style="width: 500px">
-          <el-select v-model="searchValue"
+          <el-select v-model.trim="searchValue"
                      filterable
                      style="width: 500px"
                      remote
@@ -112,7 +112,7 @@
       <el-form-item label="详细地址"
                     prop="address">
         <el-input style="width: 300px"
-                  v-model="dataForm.address"
+                  v-model.trim="dataForm.address"
                   placeholder="详细地址"></el-input>
       </el-form-item>
     </el-form>
diff --git a/src/views/modules/partymember/icpartyorg.vue b/src/views/modules/partymember/icpartyorg.vue
index 158ef6662..2e12fb68d 100644
--- a/src/views/modules/partymember/icpartyorg.vue
+++ b/src/views/modules/partymember/icpartyorg.vue
@@ -3,7 +3,7 @@
     <div class="mod-partymember__icPartyOrg}">
       <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
         <el-form-item>
-          <el-input v-model="dataForm.id" placeholder="id" clearable></el-input>
+          <el-input v-model.trim="dataForm.id" placeholder="id" clearable></el-input>
         </el-form-item>
         <el-form-item>
           <el-button @click="getDataList()">{{ $t('query') }}</el-button>
diff --git a/src/views/modules/partymember/icpartyorgtree.vue b/src/views/modules/partymember/icpartyorgtree.vue
index f605f1176..0835e86c0 100644
--- a/src/views/modules/partymember/icpartyorgtree.vue
+++ b/src/views/modules/partymember/icpartyorgtree.vue
@@ -86,7 +86,7 @@
               <el-form-item label="负责人"
                             label-width="150px"
                             prop="principal">
-                  <el-select v-model="editPrincipalData.principal"
+                  <el-select v-model.trim="editPrincipalData.principal"
                              placeholder="请选择"
                              clearable
                              style="width: 200px"
diff --git a/src/views/modules/partymember/lookMember.vue b/src/views/modules/partymember/lookMember.vue
index d201838d4..a12df7db7 100644
--- a/src/views/modules/partymember/lookMember.vue
+++ b/src/views/modules/partymember/lookMember.vue
@@ -15,7 +15,7 @@
               <div>
                 <el-form-item label="所属党组织"
                               prop="partyOrgId">
-                  <!-- <el-select v-model="searchForm.partyOrgId" filterable placeholder="请选择" clearable>
+                  <!-- <el-select v-model.trim="searchForm.partyOrgId" filterable placeholder="请选择" clearable>
                     <el-option
                       v-for="item in optionsG"
                       :key="item.value"
@@ -23,7 +23,7 @@
                       :value="item.value">
                     </el-option> -->
                   <!-- </el-select> -->
-                  <el-cascader v-model="partyOrgRange"
+                  <el-cascader v-model.trim="partyOrgRange"
                                :options="optionsG"
                                :props="partyProps"
                                clearable
@@ -31,35 +31,35 @@
                 </el-form-item>
                 <el-form-item label="姓名"
                               prop="name">
-                  <el-input v-model="searchForm.name"
+                  <el-input v-model.trim="searchForm.name"
                             placeholder="请输入"
                             class="input-width"
                             clearable></el-input>
                 </el-form-item>
                 <el-form-item label="联系电话"
                               prop="mobile">
-                  <el-input v-model="searchForm.mobile"
+                  <el-input v-model.trim="searchForm.mobile"
                             placeholder="请输入"
                             class="input-width"
                             clearable></el-input>
                 </el-form-item>
                 <el-form-item label="证件号"
                               prop="idCard">
-                  <el-input v-model="searchForm.idCard"
+                  <el-input v-model.trim="searchForm.idCard"
                             placeholder="请输入"
                             class="input-width"
                             clearable></el-input>
                 </el-form-item>
                 <el-form-item label="地址"
                               prop="address">
-                  <el-input v-model="searchForm.address"
+                  <el-input v-model.trim="searchForm.address"
                             placeholder="请输入"
                             class="input-width"
                             clearable></el-input>
                 </el-form-item>
                 <el-form-item label="职务"
                               prop="partyZw">
-                  <el-select v-model="searchForm.partyZw"
+                  <el-select v-model.trim="searchForm.partyZw"
                              filterable
                              placeholder="请选择"
                              clearable>
@@ -73,24 +73,24 @@
               </div>
               <div>
                 <!-- <el-form-item label="流动党员" prop="isLd">
-                  <el-select v-model="searchForm.isLd" filterable placeholder="请选择" clearable>
+                  <el-select v-model.trim="searchForm.isLd" filterable placeholder="请选择" clearable>
                     <el-option label="是" value="1" />
                     <el-option label="否" value="0" />
                   </el-select>
                 </el-form-item> -->
                 <!-- <el-form-item label="流动党员证号" prop="ldzh">
-                  <el-input v-model="searchForm.ldzh" placeholder="请输入" class="input-width" clearable></el-input>
+                  <el-input v-model.trim="searchForm.ldzh" placeholder="请输入" class="input-width" clearable></el-input>
                 </el-form-item> -->
 
                 <!-- <el-form-item label="是否缴费" prop="isPay">
-                  <el-select v-model="searchForm.isPay" filterable placeholder="请选择" clearable>
+                  <el-select v-model.trim="searchForm.isPay" filterable placeholder="请选择" clearable>
                     <el-option label="是" value="1" />
                     <el-option label="否" value="0" />
                   </el-select>
                 </el-form-item> -->
                 <el-form-item label="党员中心户"
                               prop="isDyzxh">
-                  <el-select v-model="searchForm.isDyzxh"
+                  <el-select v-model.trim="searchForm.isDyzxh"
                              filterable
                              placeholder="请选择"
                              clearable>
@@ -110,7 +110,7 @@
                 </el-form-item>
               </div>
               <!-- <el-form-item label="免学习" prop="isMxx">
-                <el-select v-model="searchForm.isMxx" filterable placeholder="请选择" clearable>
+                <el-select v-model.trim="searchForm.isMxx" filterable placeholder="请选择" clearable>
                   <el-option label="是" value="1" />
                   <el-option label="否" value="0" />
                 </el-select>
@@ -118,7 +118,7 @@
               <!-- <el-form-item label="最近一次缴费时间"
                             label-width="130px"
                             prop="startTime">
-                <el-date-picker v-model="timeRangePay"
+                <el-date-picker v-model.trim="timeRangePay"
                                 size="small"
                                 type="daterange"
                                 value-format="yyyy-MM-dd"
@@ -131,7 +131,7 @@
               </el-form-item> -->
               <!-- <el-form-item label="入党时间"
                             prop="startTime">
-                <el-date-picker v-model="timeRange"
+                <el-date-picker v-model.trim="timeRange"
                                 size="small"
                                 type="daterange"
                                 value-format="yyyy-MM-dd"
diff --git a/src/views/modules/plugins/change/changedeath-add-or-update.vue b/src/views/modules/plugins/change/changedeath-add-or-update.vue
index 9d225ae5e..620bd80a7 100644
--- a/src/views/modules/plugins/change/changedeath-add-or-update.vue
+++ b/src/views/modules/plugins/change/changedeath-add-or-update.vue
@@ -2,55 +2,55 @@
   <el-dialog :visible.sync="visible" :title="!dataForm.id ? $t('add') : $t('update')" :close-on-click-modal="false" :close-on-press-escape="false">
     <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" :label-width="$i18n.locale === 'en-US' ? '120px' : '80px'">
           <el-form-item label="epmet用户主键" prop="userId">
-          <el-input v-model="dataForm.userId" placeholder="epmet用户主键"></el-input>
+          <el-input v-model.trim="dataForm.userId" placeholder="epmet用户主键"></el-input>
       </el-form-item>
           <el-form-item label="姓名" prop="name">
-          <el-input v-model="dataForm.name" placeholder="姓名"></el-input>
+          <el-input v-model.trim="dataForm.name" placeholder="姓名"></el-input>
       </el-form-item>
           <el-form-item label="证件号" prop="idCard">
-          <el-input v-model="dataForm.idCard" placeholder="证件号"></el-input>
+          <el-input v-model.trim="dataForm.idCard" placeholder="证件号"></el-input>
       </el-form-item>
           <el-form-item label="联系电话" prop="mobile">
-          <el-input v-model="dataForm.mobile" placeholder="联系电话"></el-input>
+          <el-input v-model.trim="dataForm.mobile" placeholder="联系电话"></el-input>
       </el-form-item>
           <el-form-item label="性别 0女 1男" prop="gender">
-          <el-input v-model="dataForm.gender" placeholder="性别 0女 1男"></el-input>
+          <el-input v-model.trim="dataForm.gender" placeholder="性别 0女 1男"></el-input>
       </el-form-item>
           <el-form-item label="类型 0 租客 1 房东" prop="type">
-          <el-input v-model="dataForm.type" placeholder="类型 0 租客 1 房东"></el-input>
+          <el-input v-model.trim="dataForm.type" placeholder="类型 0 租客 1 房东"></el-input>
       </el-form-item>
           <el-form-item label="加入时间" prop="joinDate">
-          <el-input v-model="dataForm.joinDate" placeholder="加入时间"></el-input>
+          <el-input v-model.trim="dataForm.joinDate" placeholder="加入时间"></el-input>
       </el-form-item>
           <el-form-item label="加入原因" prop="joinReason">
-          <el-input v-model="dataForm.joinReason" placeholder="加入原因"></el-input>
+          <el-input v-model.trim="dataForm.joinReason" placeholder="加入原因"></el-input>
       </el-form-item>
           <el-form-item label="移除时间" prop="removeDate">
-          <el-input v-model="dataForm.removeDate" placeholder="移除时间"></el-input>
+          <el-input v-model.trim="dataForm.removeDate" placeholder="移除时间"></el-input>
       </el-form-item>
           <el-form-item label="移除原因" prop="removeReason">
-          <el-input v-model="dataForm.removeReason" placeholder="移除原因"></el-input>
+          <el-input v-model.trim="dataForm.removeReason" placeholder="移除原因"></el-input>
       </el-form-item>
           <el-form-item label="删除标记 0：未删除，1：已删除" prop="delFlag">
-          <el-input v-model="dataForm.delFlag" placeholder="删除标记 0：未删除，1：已删除"></el-input>
+          <el-input v-model.trim="dataForm.delFlag" placeholder="删除标记 0：未删除，1：已删除"></el-input>
       </el-form-item>
           <el-form-item label="乐观锁" prop="revision">
-          <el-input v-model="dataForm.revision" placeholder="乐观锁"></el-input>
+          <el-input v-model.trim="dataForm.revision" placeholder="乐观锁"></el-input>
       </el-form-item>
           <el-form-item label="创建人" prop="createdBy">
-          <el-input v-model="dataForm.createdBy" placeholder="创建人"></el-input>
+          <el-input v-model.trim="dataForm.createdBy" placeholder="创建人"></el-input>
       </el-form-item>
           <el-form-item label="创建时间" prop="createdTime">
-          <el-input v-model="dataForm.createdTime" placeholder="创建时间"></el-input>
+          <el-input v-model.trim="dataForm.createdTime" placeholder="创建时间"></el-input>
       </el-form-item>
           <el-form-item label="更新人" prop="updatedBy">
-          <el-input v-model="dataForm.updatedBy" placeholder="更新人"></el-input>
+          <el-input v-model.trim="dataForm.updatedBy" placeholder="更新人"></el-input>
       </el-form-item>
           <el-form-item label="更新时间" prop="updatedTime">
-          <el-input v-model="dataForm.updatedTime" placeholder="更新时间"></el-input>
+          <el-input v-model.trim="dataForm.updatedTime" placeholder="更新时间"></el-input>
       </el-form-item>
           <el-form-item label="客户ID" prop="customerId">
-          <el-input v-model="dataForm.customerId" placeholder="客户ID"></el-input>
+          <el-input v-model.trim="dataForm.customerId" placeholder="客户ID"></el-input>
       </el-form-item>
       </el-form>
     <template slot="footer">
diff --git a/src/views/modules/plugins/change/changedeath.vue b/src/views/modules/plugins/change/changedeath.vue
index 712225651..dc93e5bbc 100644
--- a/src/views/modules/plugins/change/changedeath.vue
+++ b/src/views/modules/plugins/change/changedeath.vue
@@ -9,7 +9,7 @@
       >
         <el-form-item label="姓名" prop="name">
           <el-input
-            v-model="dataForm.name"
+            v-model.trim="dataForm.name"
             size="small"
             class="u-item-width-normal"
             clearable
@@ -19,7 +19,7 @@
         </el-form-item>
         <el-form-item label="证件号" prop="idCard">
           <el-input
-            v-model="dataForm.idCard"
+            v-model.trim="dataForm.idCard"
             size="small"
             class="u-item-width-normal"
             clearable
@@ -29,7 +29,7 @@
         </el-form-item>
         <el-form-item label="联系电话" prop="mobile">
           <el-input
-            v-model="dataForm.mobile"
+            v-model.trim="dataForm.mobile"
             size="small"
             class="u-item-width-normal"
             clearable
@@ -40,7 +40,7 @@
 
         <el-form-item label="死亡时间" prop="startTime">
           <el-date-picker
-            v-model="timeRange"
+            v-model.trim="timeRange"
             type="daterange"
             class="u-item-width-daterange2"
             size="small"
@@ -54,7 +54,7 @@
         </el-form-item>
         <!-- <el-form-item label="享受福利" prop="isWelfare">
           <el-select
-            v-model="dataForm.isWelfare"
+            v-model.trim="dataForm.isWelfare"
             size="small"
             class="u-item-width-normal"
             placeholder="请选择"
diff --git a/src/views/modules/plugins/change/changerelocation-add-or-update.vue b/src/views/modules/plugins/change/changerelocation-add-or-update.vue
index a4eccfc45..00e7b0aca 100644
--- a/src/views/modules/plugins/change/changerelocation-add-or-update.vue
+++ b/src/views/modules/plugins/change/changerelocation-add-or-update.vue
@@ -2,88 +2,88 @@
   <el-dialog :visible.sync="visible" :title="!dataForm.id ? $t('add') : $t('update')" :close-on-click-modal="false" :close-on-press-escape="false">
     <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" :label-width="$i18n.locale === 'en-US' ? '120px' : '80px'">
           <el-form-item label="姓名" prop="name">
-          <el-input v-model="dataForm.name" placeholder="姓名"></el-input>
+          <el-input v-model.trim="dataForm.name" placeholder="姓名"></el-input>
       </el-form-item>
           <el-form-item label="性别" prop="gender">
-          <el-input v-model="dataForm.gender" placeholder="性别"></el-input>
+          <el-input v-model.trim="dataForm.gender" placeholder="性别"></el-input>
       </el-form-item>
           <el-form-item label="年龄" prop="age">
-          <el-input v-model="dataForm.age" placeholder="年龄"></el-input>
+          <el-input v-model.trim="dataForm.age" placeholder="年龄"></el-input>
       </el-form-item>
           <el-form-item label="组织PID" prop="pid">
-          <el-input v-model="dataForm.pid" placeholder="组织PID"></el-input>
+          <el-input v-model.trim="dataForm.pid" placeholder="组织PID"></el-input>
       </el-form-item>
           <el-form-item label="组织ID" prop="agencyId">
-          <el-input v-model="dataForm.agencyId" placeholder="组织ID"></el-input>
+          <el-input v-model.trim="dataForm.agencyId" placeholder="组织ID"></el-input>
       </el-form-item>
           <el-form-item label="组织名" prop="agencyName">
-          <el-input v-model="dataForm.agencyName" placeholder="组织名"></el-input>
+          <el-input v-model.trim="dataForm.agencyName" placeholder="组织名"></el-input>
       </el-form-item>
           <el-form-item label="房屋小区ID" prop="villageId">
-          <el-input v-model="dataForm.villageId" placeholder="房屋小区ID"></el-input>
+          <el-input v-model.trim="dataForm.villageId" placeholder="房屋小区ID"></el-input>
       </el-form-item>
           <el-form-item label="房屋小区" prop="villageName">
-          <el-input v-model="dataForm.villageName" placeholder="房屋小区"></el-input>
+          <el-input v-model.trim="dataForm.villageName" placeholder="房屋小区"></el-input>
       </el-form-item>
           <el-form-item label="楼号ID" prop="buildId">
-          <el-input v-model="dataForm.buildId" placeholder="楼号ID"></el-input>
+          <el-input v-model.trim="dataForm.buildId" placeholder="楼号ID"></el-input>
       </el-form-item>
           <el-form-item label="楼号" prop="buildName">
-          <el-input v-model="dataForm.buildName" placeholder="楼号"></el-input>
+          <el-input v-model.trim="dataForm.buildName" placeholder="楼号"></el-input>
       </el-form-item>
           <el-form-item label="单元ID" prop="unitId">
-          <el-input v-model="dataForm.unitId" placeholder="单元ID"></el-input>
+          <el-input v-model.trim="dataForm.unitId" placeholder="单元ID"></el-input>
       </el-form-item>
           <el-form-item label="单元" prop="unitName">
-          <el-input v-model="dataForm.unitName" placeholder="单元"></el-input>
+          <el-input v-model.trim="dataForm.unitName" placeholder="单元"></el-input>
       </el-form-item>
           <el-form-item label="房屋ID" prop="homeId">
-          <el-input v-model="dataForm.homeId" placeholder="房屋ID"></el-input>
+          <el-input v-model.trim="dataForm.homeId" placeholder="房屋ID"></el-input>
       </el-form-item>
           <el-form-item label="房屋" prop="homeName">
-          <el-input v-model="dataForm.homeName" placeholder="房屋"></el-input>
+          <el-input v-model.trim="dataForm.homeName" placeholder="房屋"></el-input>
       </el-form-item>
           <el-form-item label="外迁详细地址" prop="address">
-          <el-input v-model="dataForm.address" placeholder="外迁详细地址"></el-input>
+          <el-input v-model.trim="dataForm.address" placeholder="外迁详细地址"></el-input>
       </el-form-item>
           <el-form-item label="操作类型【客户外out,客户内in】" prop="type">
-          <el-input v-model="dataForm.type" placeholder="操作类型【客户外out,客户内in】"></el-input>
+          <el-input v-model.trim="dataForm.type" placeholder="操作类型【客户外out,客户内in】"></el-input>
       </el-form-item>
           <el-form-item label="原房主姓名" prop="ownerName">
-          <el-input v-model="dataForm.ownerName" placeholder="原房主姓名"></el-input>
+          <el-input v-model.trim="dataForm.ownerName" placeholder="原房主姓名"></el-input>
       </el-form-item>
           <el-form-item label="原网格信息" prop="oldDept">
-          <el-input v-model="dataForm.oldDept" placeholder="原网格信息"></el-input>
+          <el-input v-model.trim="dataForm.oldDept" placeholder="原网格信息"></el-input>
       </el-form-item>
           <el-form-item label="原房屋信息" prop="oldAddress">
-          <el-input v-model="dataForm.oldAddress" placeholder="原房屋信息"></el-input>
+          <el-input v-model.trim="dataForm.oldAddress" placeholder="原房屋信息"></el-input>
       </el-form-item>
           <el-form-item label="原房间号" prop="oldHome">
-          <el-input v-model="dataForm.oldHome" placeholder="原房间号"></el-input>
+          <el-input v-model.trim="dataForm.oldHome" placeholder="原房间号"></el-input>
       </el-form-item>
           <el-form-item label="浅出原因" prop="reason">
-          <el-input v-model="dataForm.reason" placeholder="浅出原因"></el-input>
+          <el-input v-model.trim="dataForm.reason" placeholder="浅出原因"></el-input>
       </el-form-item>
           <el-form-item label="删除标记 0：未删除，1：已删除" prop="delFlag">
-          <el-input v-model="dataForm.delFlag" placeholder="删除标记 0：未删除，1：已删除"></el-input>
+          <el-input v-model.trim="dataForm.delFlag" placeholder="删除标记 0：未删除，1：已删除"></el-input>
       </el-form-item>
           <el-form-item label="乐观锁" prop="revision">
-          <el-input v-model="dataForm.revision" placeholder="乐观锁"></el-input>
+          <el-input v-model.trim="dataForm.revision" placeholder="乐观锁"></el-input>
       </el-form-item>
           <el-form-item label="创建人" prop="createdBy">
-          <el-input v-model="dataForm.createdBy" placeholder="创建人"></el-input>
+          <el-input v-model.trim="dataForm.createdBy" placeholder="创建人"></el-input>
       </el-form-item>
           <el-form-item label="创建时间" prop="createdTime">
-          <el-input v-model="dataForm.createdTime" placeholder="创建时间"></el-input>
+          <el-input v-model.trim="dataForm.createdTime" placeholder="创建时间"></el-input>
       </el-form-item>
           <el-form-item label="更新人" prop="updatedBy">
-          <el-input v-model="dataForm.updatedBy" placeholder="更新人"></el-input>
+          <el-input v-model.trim="dataForm.updatedBy" placeholder="更新人"></el-input>
       </el-form-item>
           <el-form-item label="更新时间" prop="updatedTime">
-          <el-input v-model="dataForm.updatedTime" placeholder="更新时间"></el-input>
+          <el-input v-model.trim="dataForm.updatedTime" placeholder="更新时间"></el-input>
       </el-form-item>
           <el-form-item label="客户ID" prop="customerId">
-          <el-input v-model="dataForm.customerId" placeholder="客户ID"></el-input>
+          <el-input v-model.trim="dataForm.customerId" placeholder="客户ID"></el-input>
       </el-form-item>
       </el-form>
     <template slot="footer">
diff --git a/src/views/modules/plugins/change/changerelocation.vue b/src/views/modules/plugins/change/changerelocation.vue
index 398032375..8da8cee4c 100644
--- a/src/views/modules/plugins/change/changerelocation.vue
+++ b/src/views/modules/plugins/change/changerelocation.vue
@@ -100,7 +100,7 @@
 
         <el-form-item label="姓名" prop="name">
           <el-input
-            v-model="dataForm.name"
+            v-model.trim="dataForm.name"
             size="small"
             class="u-item-width-normal"
             clearable
@@ -110,7 +110,7 @@
         </el-form-item>
         <el-form-item label="证件号" prop="idCard">
           <el-input
-            v-model="dataForm.idCard"
+            v-model.trim="dataForm.idCard"
             size="small"
             class="u-item-width-normal"
             clearable
@@ -120,7 +120,7 @@
         </el-form-item>
         <el-form-item label="联系电话" prop="mobile">
           <el-input
-            v-model="dataForm.mobile"
+            v-model.trim="dataForm.mobile"
             size="small"
             class="u-item-width-normal"
             clearable
@@ -131,7 +131,7 @@
 
         <el-form-item label="迁出时间" prop="startTime">
           <el-date-picker
-            v-model="timeRange"
+            v-model.trim="timeRange"
             type="daterange"
             clearable
             size="small"
@@ -146,7 +146,7 @@
         </el-form-item>
         <!-- <el-form-item label="享受福利"
                       prop="isWelfare">
-          <el-select v-model="dataForm.isWelfare"
+          <el-select v-model.trim="dataForm.isWelfare"
                      placeholder="请选择"
                      class="u-item-width-normal"
                      clearable>
diff --git a/src/views/modules/plugins/change/changewelfare-add-or-update.vue b/src/views/modules/plugins/change/changewelfare-add-or-update.vue
index a2c4af9b9..ad0404486 100644
--- a/src/views/modules/plugins/change/changewelfare-add-or-update.vue
+++ b/src/views/modules/plugins/change/changewelfare-add-or-update.vue
@@ -2,58 +2,58 @@
   <el-dialog :visible.sync="visible" :title="!dataForm.id ? $t('add') : $t('update')" :close-on-click-modal="false" :close-on-press-escape="false">
     <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" :label-width="$i18n.locale === 'en-US' ? '120px' : '80px'">
           <el-form-item label="epmet用户主键" prop="userId">
-          <el-input v-model="dataForm.userId" placeholder="epmet用户主键"></el-input>
+          <el-input v-model.trim="dataForm.userId" placeholder="epmet用户主键"></el-input>
       </el-form-item>
           <el-form-item label="epmet网格ID" prop="gridId">
-          <el-input v-model="dataForm.gridId" placeholder="epmet网格ID"></el-input>
+          <el-input v-model.trim="dataForm.gridId" placeholder="epmet网格ID"></el-input>
       </el-form-item>
           <el-form-item label="姓名" prop="name">
-          <el-input v-model="dataForm.name" placeholder="姓名"></el-input>
+          <el-input v-model.trim="dataForm.name" placeholder="姓名"></el-input>
       </el-form-item>
           <el-form-item label="证件号" prop="idCard">
-          <el-input v-model="dataForm.idCard" placeholder="证件号"></el-input>
+          <el-input v-model.trim="dataForm.idCard" placeholder="证件号"></el-input>
       </el-form-item>
           <el-form-item label="联系电话" prop="mobile">
-          <el-input v-model="dataForm.mobile" placeholder="联系电话"></el-input>
+          <el-input v-model.trim="dataForm.mobile" placeholder="联系电话"></el-input>
       </el-form-item>
           <el-form-item label="性别 0女 1男" prop="gender">
-          <el-input v-model="dataForm.gender" placeholder="性别 0女 1男"></el-input>
+          <el-input v-model.trim="dataForm.gender" placeholder="性别 0女 1男"></el-input>
       </el-form-item>
           <el-form-item label="类型" prop="type">
-          <el-input v-model="dataForm.type" placeholder="类型"></el-input>
+          <el-input v-model.trim="dataForm.type" placeholder="类型"></el-input>
       </el-form-item>
           <el-form-item label="加入时间" prop="joinDate">
-          <el-input v-model="dataForm.joinDate" placeholder="加入时间"></el-input>
+          <el-input v-model.trim="dataForm.joinDate" placeholder="加入时间"></el-input>
       </el-form-item>
           <el-form-item label="加入原因" prop="joinReason">
-          <el-input v-model="dataForm.joinReason" placeholder="加入原因"></el-input>
+          <el-input v-model.trim="dataForm.joinReason" placeholder="加入原因"></el-input>
       </el-form-item>
           <el-form-item label="移除时间" prop="removeDate">
-          <el-input v-model="dataForm.removeDate" placeholder="移除时间"></el-input>
+          <el-input v-model.trim="dataForm.removeDate" placeholder="移除时间"></el-input>
       </el-form-item>
           <el-form-item label="移除原因" prop="removeReason">
-          <el-input v-model="dataForm.removeReason" placeholder="移除原因"></el-input>
+          <el-input v-model.trim="dataForm.removeReason" placeholder="移除原因"></el-input>
       </el-form-item>
           <el-form-item label="删除标记 0：未删除，1：已删除" prop="delFlag">
-          <el-input v-model="dataForm.delFlag" placeholder="删除标记 0：未删除，1：已删除"></el-input>
+          <el-input v-model.trim="dataForm.delFlag" placeholder="删除标记 0：未删除，1：已删除"></el-input>
       </el-form-item>
           <el-form-item label="乐观锁" prop="revision">
-          <el-input v-model="dataForm.revision" placeholder="乐观锁"></el-input>
+          <el-input v-model.trim="dataForm.revision" placeholder="乐观锁"></el-input>
       </el-form-item>
           <el-form-item label="创建人" prop="createdBy">
-          <el-input v-model="dataForm.createdBy" placeholder="创建人"></el-input>
+          <el-input v-model.trim="dataForm.createdBy" placeholder="创建人"></el-input>
       </el-form-item>
           <el-form-item label="创建时间" prop="createdTime">
-          <el-input v-model="dataForm.createdTime" placeholder="创建时间"></el-input>
+          <el-input v-model.trim="dataForm.createdTime" placeholder="创建时间"></el-input>
       </el-form-item>
           <el-form-item label="更新人" prop="updatedBy">
-          <el-input v-model="dataForm.updatedBy" placeholder="更新人"></el-input>
+          <el-input v-model.trim="dataForm.updatedBy" placeholder="更新人"></el-input>
       </el-form-item>
           <el-form-item label="更新时间" prop="updatedTime">
-          <el-input v-model="dataForm.updatedTime" placeholder="更新时间"></el-input>
+          <el-input v-model.trim="dataForm.updatedTime" placeholder="更新时间"></el-input>
       </el-form-item>
           <el-form-item label="客户ID" prop="customerId">
-          <el-input v-model="dataForm.customerId" placeholder="客户ID"></el-input>
+          <el-input v-model.trim="dataForm.customerId" placeholder="客户ID"></el-input>
       </el-form-item>
       </el-form>
     <template slot="footer">
diff --git a/src/views/modules/plugins/change/changewelfare.vue b/src/views/modules/plugins/change/changewelfare.vue
index 8a0fe25ad..0de21bc90 100644
--- a/src/views/modules/plugins/change/changewelfare.vue
+++ b/src/views/modules/plugins/change/changewelfare.vue
@@ -4,7 +4,7 @@
       <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
         <el-form-item label="姓名"
                       prop="name">
-          <el-input v-model="dataForm.name"
+          <el-input v-model.trim="dataForm.name"
                     size="small"
                     class="list_item_width_1"
                     clearable
@@ -13,7 +13,7 @@
         </el-form-item>
         <el-form-item label="证件号"
                       prop="idCard">
-          <el-input v-model="dataForm.idCard"
+          <el-input v-model.trim="dataForm.idCard"
                     size="small"
                     class="list_item_width_1"
                     clearable
@@ -22,7 +22,7 @@
         </el-form-item>
         <el-form-item label="联系电话"
                       prop="mobile">
-          <el-input v-model="dataForm.mobile"
+          <el-input v-model.trim="dataForm.mobile"
                     size="small"
                     class="list_item_width_1"
                     clearable
@@ -31,7 +31,7 @@
         </el-form-item>
         <el-form-item label="加入时间"
                       prop="startTime">
-          <el-date-picker v-model="timeRange"
+          <el-date-picker v-model.trim="timeRange"
                           type="daterange"
                           clearable
                           size="small"
@@ -124,7 +124,7 @@
               title="移除原因"
               :visible.sync="removeVisible"
               width="40%">
-        <textarea v-model="removeReason" placeholder="请输入移除福利人员的原因" class="blacklist-reason"></textarea>
+        <textarea v-model.trim="removeReason" placeholder="请输入移除福利人员的原因" class="blacklist-reason"></textarea>
         <span slot="footer" class="dialog-footer">
         <el-button @click="removeVisible = false">取 消</el-button>
         <el-button type="primary" @click="removeHandle">确 定</el-button>
diff --git a/src/views/modules/plugins/change/resichange.vue b/src/views/modules/plugins/change/resichange.vue
index 43764bfdc..9ce9213e5 100644
--- a/src/views/modules/plugins/change/resichange.vue
+++ b/src/views/modules/plugins/change/resichange.vue
@@ -116,7 +116,7 @@
       <div class="div-flex">
         <div class="div_del">
           <!-- <el-checkbox :indeterminate="isIndeterminate"
-                       v-model="selAllFlag"
+                       v-model.trim="selAllFlag"
                        :disabled="selAllFlagDisabled"
                        @change="handleSelectAll">全选</el-checkbox>
           <el-button v-if="selection.length > 0"
@@ -157,7 +157,7 @@
              class="resi-other">
           <div class="resi-other-title">其他</div>
           <div class="tabs-other-info">
-            <el-tabs v-model="activeName"
+            <el-tabs v-model.trim="activeName"
                      @tab-click="handleClick">
               <el-tab-pane v-for="item in tabsList"
                            :key="item.columnName"
@@ -205,7 +205,7 @@
              class="resi-other">
           <div class="resi-other-title">其他</div>
           <div class="tabs-other-info">
-            <el-tabs v-model="activeName"
+            <el-tabs v-model.trim="activeName"
                      @tab-click="handleClick">
               <el-tab-pane v-for="item in tabsList"
                            :key="item.columnName"
@@ -266,7 +266,7 @@
     <el-dialog title="迁入死亡人口的原因"
                :visible.sync="blacklistVisible"
                width="40%">
-      <textarea v-model="blacklistReason"
+      <textarea v-model.trim="blacklistReason"
                 placeholder="请输入迁入死亡人口的原因"
                 class="blacklist-reason"></textarea>
       <span slot="footer"
@@ -283,7 +283,7 @@
 import nextTick from 'dai-js/tools/nextTick'
 import deathSearch from '../../../components/deathSearch.vue'
 import resiForm from '../../../components/resiForm.vue'
-import editResi from '../../../components/editResi.vue'
+import editResi from '../../../components/editResiCopy.vue'
 import axios from 'axios'
 import { mapGetters } from 'vuex'
 import resiChangeTransfer from '../../../components/resiChangeTransfer.vue'
diff --git a/src/views/modules/plugins/change/resideath.vue b/src/views/modules/plugins/change/resideath.vue
index 35611ff0b..4086f8314 100644
--- a/src/views/modules/plugins/change/resideath.vue
+++ b/src/views/modules/plugins/change/resideath.vue
@@ -112,7 +112,7 @@
       <div class="div-flex">
         <div class="div_del">
           <!-- <el-checkbox :indeterminate="isIndeterminate"
-                       v-model="selAllFlag"
+                       v-model.trim="selAllFlag"
                        :disabled="selAllFlagDisabled"
                        @change="handleSelectAll">全选</el-checkbox>
           <el-button v-if="selection.length > 0"
@@ -153,7 +153,7 @@
              class="resi-other">
           <div class="resi-other-title">其他</div>
           <div class="tabs-other-info">
-            <el-tabs v-model="activeName"
+            <el-tabs v-model.trim="activeName"
                      @tab-click="handleClick">
               <el-tab-pane v-for="item in tabsList"
                            :key="item.columnName"
@@ -201,7 +201,7 @@
              class="resi-other">
           <div class="resi-other-title">其他</div>
           <div class="tabs-other-info">
-            <el-tabs v-model="activeName"
+            <el-tabs v-model.trim="activeName"
                      @tab-click="handleClick">
               <el-tab-pane v-for="item in tabsList"
                            :key="item.columnName"
@@ -277,19 +277,19 @@
                       type="textarea"
                       :rows="3"
                       placeholder="请输入死亡原因"
-                      v-model="blacklistReason"></el-input>
+                      v-model.trim="blacklistReason"></el-input>
 
           </el-form-item>
 
           <!-- <el-form-item label="享受福利"
                         prop="gridId"
                         style="display: block">
-            <el-checkbox v-model="welfareFlag"></el-checkbox>
+            <el-checkbox v-model.trim="welfareFlag"></el-checkbox>
           </el-form-item> -->
           <el-form-item label="死亡日期"
                         prop="gridId"
                         style="display: block">
-            <el-date-picker v-model="deathDate"
+            <el-date-picker v-model.trim="deathDate"
                             type="date"
                             value-format="yyyy-MM-dd HH:mm:ss"
                             format="yyyy-MM-dd"
@@ -325,7 +325,7 @@
 import nextTick from 'dai-js/tools/nextTick'
 import deathSearch from '../../../components/deathSearch.vue'
 import resiForm from '../../../components/resiForm.vue'
-import editResi from '../../../components/editResi.vue'
+import editResi from '../../../components/editResiCopy.vue'
 import axios from 'axios'
 import { mapGetters } from 'vuex'
 import resiTransfer from '../../../components/resiTransfer.vue'
diff --git a/src/views/modules/plugins/change/resideathAdd.vue b/src/views/modules/plugins/change/resideathAdd.vue
index f202ecc9a..552409bcd 100644
--- a/src/views/modules/plugins/change/resideathAdd.vue
+++ b/src/views/modules/plugins/change/resideathAdd.vue
@@ -23,7 +23,7 @@
         <el-form-item label="死亡日期" style="display: block" prop="deathDate">
           <el-date-picker
           :picker-options="startPickerOptions"
-            v-model="dataForm.deathDate"
+            v-model.trim="dataForm.deathDate"
             class="u-edit-width-normal"
             type="date"
             value-format="yyyy-MM-dd HH:mm:ss"
@@ -44,7 +44,7 @@
               resize="none"
               class="u-edit-width-normal"
               placeholder="请输入死亡原因"
-              v-model="dataForm.deathReason"
+              v-model.trim="dataForm.deathReason"
             >
             </el-input>
           </el-form-item>
@@ -52,7 +52,7 @@
         <!-- <el-form-item label="享受福利"
                       style="display: block"
                       prop="welfareFlag">
-          <el-checkbox v-model="dataForm.welfareFlag">享受</el-checkbox>
+          <el-checkbox v-model.trim="dataForm.welfareFlag">享受</el-checkbox>
         </el-form-item> -->
       </el-form>
     </div>
diff --git a/src/views/modules/plugins/change/resiwelfare.vue b/src/views/modules/plugins/change/resiwelfare.vue
index f4ca9a53c..8fbf757ae 100644
--- a/src/views/modules/plugins/change/resiwelfare.vue
+++ b/src/views/modules/plugins/change/resiwelfare.vue
@@ -114,7 +114,7 @@
       <div class="div-flex">
         <div class="div_del">
           <!-- <el-checkbox :indeterminate="isIndeterminate"
-                       v-model="selAllFlag"
+                       v-model.trim="selAllFlag"
                        :disabled="selAllFlagDisabled"
                        @change="handleSelectAll">全选</el-checkbox>
           <el-button v-if="selection.length > 0"
@@ -155,7 +155,7 @@
              class="resi-other">
           <div class="resi-other-title">其他</div>
           <div class="tabs-other-info">
-            <el-tabs v-model="activeName"
+            <el-tabs v-model.trim="activeName"
                      @tab-click="handleClick">
               <el-tab-pane v-for="item in tabsList"
                            :key="item.columnName"
@@ -203,7 +203,7 @@
              class="resi-other">
           <div class="resi-other-title">其他</div>
           <div class="tabs-other-info">
-            <el-tabs v-model="activeName"
+            <el-tabs v-model.trim="activeName"
                      @tab-click="handleClick">
               <el-tab-pane v-for="item in tabsList"
                            :key="item.columnName"
@@ -265,7 +265,7 @@
       title="添加福利人员的原因"
       :visible.sync="blacklistVisible"
       width="40%">
-      <textarea v-model="blacklistReason" placeholder="请输入添加福利人员的原因" class="blacklist-reason"></textarea>
+      <textarea v-model.trim="blacklistReason" placeholder="请输入添加福利人员的原因" class="blacklist-reason"></textarea>
       <span slot="footer" class="dialog-footer">
         <el-button @click="blacklistVisible = false">取 消</el-button>
         <el-button type="primary" @click="confirmJoinDeathlist">确 定</el-button>
@@ -278,7 +278,7 @@
 import nextTick from 'dai-js/tools/nextTick'
 import deathSearch from '../../../components/deathSearch.vue'
 import resiForm from '../../../components/resiForm.vue'
-import editResi from '../../../components/editResi.vue'
+import editResi from '../../../components/editResiCopy.vue'
 import axios from 'axios'
 import { mapGetters } from 'vuex'
 import resiTransfer from '../../../components/resiTransfer.vue'
diff --git a/src/views/modules/plugins/change/verify.vue b/src/views/modules/plugins/change/verify.vue
index 4965635f0..7f63d5567 100644
--- a/src/views/modules/plugins/change/verify.vue
+++ b/src/views/modules/plugins/change/verify.vue
@@ -87,7 +87,7 @@
 
         <el-form-item label="姓名"
                       prop="name">
-          <el-input v-model="fmData.name"
+          <el-input v-model.trim="fmData.name"
                     class="u-item-width-normal"
                     size="small"
                     clearable
@@ -97,7 +97,7 @@
 
         <el-form-item label="联系电话"
                       prop="mobile">
-          <el-input v-model="fmData.mobile"
+          <el-input v-model.trim="fmData.mobile"
                     class="u-item-width-normal"
                     size="small"
                     clearable
@@ -107,7 +107,7 @@
 
         <el-form-item label="证件号"
                       prop="idCard">
-          <el-input v-model="fmData.idCard"
+          <el-input v-model.trim="fmData.idCard"
                     class="u-item-width-normal"
                     size="small"
                     clearable
@@ -117,7 +117,7 @@
 
         <!-- <el-form-item label="迁入时间" prop="startTime">
             <el-date-picker
-              v-model="rangeTime"
+              v-model.trim="rangeTime"
               type="daterange"
               range-separator="至"
               start-placeholder="开始日期"
diff --git a/src/views/modules/plugins/change/verifyForm copy.vue b/src/views/modules/plugins/change/verifyForm copy.vue
index 62af3506c..113344edf 100644
--- a/src/views/modules/plugins/change/verifyForm copy.vue	
+++ b/src/views/modules/plugins/change/verifyForm copy.vue	
@@ -109,7 +109,7 @@
           label="同时迁至其他房屋:"
           label-width="150px"
         >
-          <el-radio-group v-model="isMoveOut">
+          <el-radio-group v-model.trim="isMoveOut">
             <el-radio :label="1">需要</el-radio>
             <el-radio :label="0">不需要</el-radio>
           </el-radio-group>
@@ -122,7 +122,7 @@
             { required: true, message: '请填写驳回原因', trigger: 'blur' },
           ]"
         >
-          <el-input type="textarea" v-model="reason" style="width: 300px;"></el-input>
+          <el-input type="textarea" v-model.trim="reason" style="width: 300px;"></el-input>
         </el-form-item>
         <!-- <template v-if="btnType == 'detail' && confirmResult == '1'">
           <el-form-item
@@ -188,7 +188,7 @@
 
         <el-form-item label="迁出时间:" prop="outOfTime" label-width="150px">
           <el-date-picker
-            v-model="dataForm.outOfTime"
+            v-model.trim="dataForm.outOfTime"
             type="date"
             value-format="yyyy-MM-dd HH:mm:ss"
             format="yyyy-MM-dd"
@@ -205,7 +205,7 @@
           label-width="150px"
           style="display: block"
         >
-          <el-radio-group v-model="dataForm.type">
+          <el-radio-group v-model.trim="dataForm.type">
             <el-radio :label="'in'">{{
               '迁往' + rootAgency.organizationName + '内其他区域'
             }}</el-radio>
@@ -217,7 +217,7 @@
           <el-form-item label="迁出至" prop="agencyId" label-width="150px">
             <el-cascader
               ref="myCascader"
-              v-model="agencyIdArray"
+              v-model.trim="agencyIdArray"
               style="width: 480px"
               :key="iscascaderShow"
               :options="casOptions"
@@ -304,7 +304,7 @@
               resize="none"
               style="width: 600px"
               placeholder="请输入外迁详细地址"
-              v-model="dataForm.address"
+              v-model.trim="dataForm.address"
             >
             </el-input>
           </el-form-item>
@@ -317,12 +317,12 @@
             resize="none"
             style="width: 600px"
             placeholder="请输入迁出原因"
-            v-model="dataForm.reason"
+            v-model.trim="dataForm.reason"
           >
           </el-input>
         </el-form-item>
         <el-form-item label="" prop="welfareFlag" label-width="150px">
-          <el-checkbox v-model="dataForm.welfareFlag">享受福利</el-checkbox>
+          <el-checkbox v-model.trim="dataForm.welfareFlag">享受福利</el-checkbox>
         </el-form-item>
       </el-form>
     </div>
diff --git a/src/views/modules/plugins/change/verifyForm.vue b/src/views/modules/plugins/change/verifyForm.vue
index a3043b03b..91d7a0301 100644
--- a/src/views/modules/plugins/change/verifyForm.vue
+++ b/src/views/modules/plugins/change/verifyForm.vue
@@ -63,7 +63,7 @@
         </el-form-item>
         <el-form-item v-if="confirmResult == 1"
                       label="同时迁至其他房屋">
-          <el-radio-group v-model="isMoveOut">
+          <el-radio-group v-model.trim="isMoveOut">
             <el-radio :label="1">需要</el-radio>
             <el-radio :label="0">不需要</el-radio>
           </el-radio-group>
@@ -74,7 +74,7 @@
             { required: true, message: '请填写驳回原因', trigger: 'blur' },
           ]">
           <el-input type="textarea"
-                    v-model="reason"
+                    v-model.trim="reason"
                     class="u-edit-width-normal"></el-input>
         </el-form-item>
 
@@ -120,7 +120,7 @@
 
         <el-form-item label="迁出时间"
                       prop="outOfTime">
-          <el-date-picker v-model="dataForm.outOfTime"
+          <el-date-picker v-model.trim="dataForm.outOfTime"
                           type="date"
                           value-format="yyyy-MM-dd HH:mm:ss"
                           format="yyyy-MM-dd"
@@ -134,7 +134,7 @@
           <el-form-item label="迁出至"
                         prop="agencyId">
             <el-cascader ref="myCascader"
-                         v-model="agencyIdArray"
+                         v-model.trim="agencyIdArray"
                          class="u-edit-width-normal"
                          :key="iscascaderShow"
                          :options="casOptions"
@@ -209,12 +209,12 @@
                     class="u-edit-width-normal"
                     resize="none"
                     placeholder="请输入迁出原因"
-                    v-model="dataForm.reason">
+                    v-model.trim="dataForm.reason">
           </el-input>
         </el-form-item>
         <el-form-item label=""
                       prop="welfareFlag">
-          <el-checkbox v-model="dataForm.welfareFlag">享受福利</el-checkbox>
+          <el-checkbox v-model.trim="dataForm.welfareFlag">享受福利</el-checkbox>
         </el-form-item>
       </el-form>
     </div>
diff --git a/src/views/modules/plugins/point/icpointNoice.vue b/src/views/modules/plugins/point/icpointNoice.vue
index 03f8b24e9..5db63679b 100644
--- a/src/views/modules/plugins/point/icpointNoice.vue
+++ b/src/views/modules/plugins/point/icpointNoice.vue
@@ -15,10 +15,10 @@
           style="display: block"
         >
           <span>小程序通知</span>
-          <!-- <el-checkbox v-model="formData.isSelChannel"
+          <!-- <el-checkbox v-model.trim="formData.isSelChannel"
                        key="0"
                        label="0">小程序通知</el-checkbox> -->
-          <!-- <el-checkbox-group v-model="formData.channel">
+          <!-- <el-checkbox-group v-model.trim="formData.channel">
             <el-checkbox key="1"
                          label="1">小程序通知</el-checkbox>
             <el-checkbox key="2"
@@ -41,7 +41,7 @@
             :autosize="{ minRows: 10, maxRows: 15 }"
             clearable
             placeholder="请输入通知内容"
-            v-model="formData.content"
+            v-model.trim="formData.content"
           ></el-input>
         </el-form-item>
       </el-form>
diff --git a/src/views/modules/plugins/point/icpointnucleicmonitoring-add-or-update.vue b/src/views/modules/plugins/point/icpointnucleicmonitoring-add-or-update.vue
index cb3f83a97..c06035128 100644
--- a/src/views/modules/plugins/point/icpointnucleicmonitoring-add-or-update.vue
+++ b/src/views/modules/plugins/point/icpointnucleicmonitoring-add-or-update.vue
@@ -8,7 +8,7 @@
              label-width="150px">
       <el-form-item label="所属组织名称"
                     prop="orgId">
-        <el-select v-model="dataForm.orgId"
+        <el-select v-model.trim="dataForm.orgId"
                    placeholder="所属组织名称"
                    @change="orgChangeHandle"
                    :disabled="dialogTitle == '查看'">
@@ -22,13 +22,13 @@
       </el-form-item>
       <el-form-item label="核酸检测点名称"
                     prop="name">
-        <el-input v-model="dataForm.name"
+        <el-input v-model.trim="dataForm.name"
                   placeholder="核酸检测点名称"
                   :disabled="dialogTitle == '查看'"></el-input>
       </el-form-item>
       <el-form-item label="服务时间"
                     prop="serveTime">
-        <el-input v-model="dataForm.serveTime"
+        <el-input v-model.trim="dataForm.serveTime"
                   type="textarea"
                   :rows="2"
                   placeholder="请输入服务时间，如：每日开放 上午：8:00-11:30 ；下午：13:00-17:00"
@@ -36,7 +36,7 @@
       </el-form-item>
       <el-form-item label="咨询电话"
                     prop="mobile">
-        <el-input v-model="dataForm.mobile"
+        <el-input v-model.trim="dataForm.mobile"
                   placeholder="咨询电话"
                   :change="check_num()"
                   :disabled="dialogTitle == '查看'"></el-input>
@@ -46,7 +46,7 @@
                     prop="longitude"
                     style="display: block">
         <div style="width: 500px">
-          <el-select v-model="searchValue"
+          <el-select v-model.trim="searchValue"
                      filterable
                      style="width: 500px"
                      remote
@@ -68,7 +68,7 @@
 
       <el-form-item label="检测点地址"
                     prop="address">
-        <el-input v-model="dataForm.address"
+        <el-input v-model.trim="dataForm.address"
                   placeholder="例:青岛市时代国际广场"
                   style="width:65%;"></el-input>
 
diff --git a/src/views/modules/plugins/point/icpointnucleicmonitoring.vue b/src/views/modules/plugins/point/icpointnucleicmonitoring.vue
index a9556f2ce..94dab0a5d 100644
--- a/src/views/modules/plugins/point/icpointnucleicmonitoring.vue
+++ b/src/views/modules/plugins/point/icpointnucleicmonitoring.vue
@@ -7,7 +7,7 @@
         <el-form-item label="所属组织名称"
                       prop="orgName">
           <el-cascader ref="org"
-                       v-model="orgIds"
+                       v-model.trim="orgIds"
                        :options="organizationList"
                        :props="{ checkStrictly: true, multiple: false, emitPath: true }"
                        style="width: 200px"
@@ -17,13 +17,13 @@
         </el-form-item>
         <el-form-item label="核酸检测点名称"
                       prop="name">
-          <el-input v-model="dataForm.name"
+          <el-input v-model.trim="dataForm.name"
                     placeholder="核酸检测点名称"
                     clearable></el-input>
         </el-form-item>
         <el-form-item label="咨询电话"
                       prop="mobile">
-          <el-input v-model="dataForm.mobile"
+          <el-input v-model.trim="dataForm.mobile"
                     placeholder="咨询电话"
                     clearable></el-input>
         </el-form-item>
diff --git a/src/views/modules/plugins/point/icpointvaccinesinoculation-add-or-update.vue b/src/views/modules/plugins/point/icpointvaccinesinoculation-add-or-update.vue
index 78c3f79b4..5050dea2e 100644
--- a/src/views/modules/plugins/point/icpointvaccinesinoculation-add-or-update.vue
+++ b/src/views/modules/plugins/point/icpointvaccinesinoculation-add-or-update.vue
@@ -7,7 +7,7 @@
              @keyup.enter.native="dataFormSubmitHandle()"
              label-width="150px">
       <!--<el-form-item label="所属组织名称" prop="orgName">-->
-      <!--<el-select v-model="dataForm.orgName" placeholder="所属组织名称">-->
+      <!--<el-select v-model.trim="dataForm.orgName" placeholder="所属组织名称">-->
       <!--<el-option-->
       <!--v-for="item in organizationList"-->
       <!--:key="item.value"-->
@@ -19,7 +19,7 @@
       <!--</el-form-item>-->
       <el-form-item label="疫苗接种点名称"
                     prop="name">
-        <el-input v-model="dataForm.name"
+        <el-input v-model.trim="dataForm.name"
                   placeholder="疫苗接种点名称"
                   :disabled="dialogTitle == '查看'"></el-input>
       </el-form-item>
@@ -27,7 +27,7 @@
                     :class="dataForm.noAvailableVaccines != '2' ? '' : 'time-class'">
         <div class="data-block">
           <div style="width: 30%">
-            <el-date-picker v-model="dataForm.inoculationDate"
+            <el-date-picker v-model.trim="dataForm.inoculationDate"
                             value-format="yyyy-MM-dd"
                             type="date"
                             :clearable="false"
@@ -39,7 +39,7 @@
             <div>
               <span>上午</span>
               <el-time-picker is-range
-                              v-model="morningTime"
+                              v-model.trim="morningTime"
                               format="HH:mm"
                               value-format="HH:mm"
                               range-separator="至"
@@ -56,7 +56,7 @@
             <div>
               <span>下午</span>
               <el-time-picker is-range
-                              v-model="afterTime"
+                              v-model.trim="afterTime"
                               format="HH:mm"
                               value-format="HH:mm"
                               range-separator="至"
@@ -75,14 +75,14 @@
       </el-form-item>
       <el-form-item label=""
                     prop="noAvailableVaccines">
-        <el-checkbox v-model="dataForm.noAvailableVaccines"
+        <el-checkbox v-model.trim="dataForm.noAvailableVaccines"
                      true-label="1"
                      false-label="2"
                      :disabled="dialogTitle == '查看'">暂无疫苗</el-checkbox>
       </el-form-item>
       <el-form-item label="咨询电话"
                     prop="mobile">
-        <el-input v-model="dataForm.mobile"
+        <el-input v-model.trim="dataForm.mobile"
                   :disabled="dialogTitle == '查看'"
                   placeholder="咨询电话"></el-input>
       </el-form-item>
@@ -91,7 +91,7 @@
                     prop="longitude"
                     style="display: block">
         <div style="width: 500px">
-          <el-select v-model="searchValue"
+          <el-select v-model.trim="searchValue"
                      filterable
                      style="width: 500px"
                      remote
@@ -113,7 +113,7 @@
 
       <el-form-item label="接种点地址"
                     prop="address">
-        <el-input v-model="dataForm.address"
+        <el-input v-model.trim="dataForm.address"
                   placeholder="例:青岛市时代国际广场"
                   style="width: 65%"></el-input>
 
diff --git a/src/views/modules/plugins/point/icpointvaccinesinoculation.vue b/src/views/modules/plugins/point/icpointvaccinesinoculation.vue
index 4f5025ad1..f8b242123 100644
--- a/src/views/modules/plugins/point/icpointvaccinesinoculation.vue
+++ b/src/views/modules/plugins/point/icpointvaccinesinoculation.vue
@@ -7,13 +7,13 @@
                @keyup.enter.native="loadTable()">
         <el-form-item label="疫苗接种点名称"
                       prop="name">
-          <el-input v-model="dataForm.name"
+          <el-input v-model.trim="dataForm.name"
                     placeholder="核酸检测点名称"
                     clearable></el-input>
         </el-form-item>
         <el-form-item label="咨询电话"
                       prop="mobile">
-          <el-input v-model="dataForm.mobile"
+          <el-input v-model.trim="dataForm.mobile"
                     placeholder="咨询电话"
                     clearable></el-input>
         </el-form-item>
diff --git a/src/views/modules/plugins/power/kernelhousehold.vue b/src/views/modules/plugins/power/kernelhousehold.vue
index 70755f363..adccbe50e 100644
--- a/src/views/modules/plugins/power/kernelhousehold.vue
+++ b/src/views/modules/plugins/power/kernelhousehold.vue
@@ -8,7 +8,7 @@
           <el-cascader style="width:350px"
                        placeholder="请选择所属组织"
                        :options="agencytree"
-                       v-model="agencyId"
+                       v-model.trim="agencyId"
                        :props="{ expandTrigger: 'hover', label: 'orgName', value: 'orgId', children: 'subOrgList' }"
                        clearable />
         </el-form-item>
@@ -24,7 +24,7 @@
       <div :style="{height:rowHeight}"
            class="div_tree">
         <el-input placeholder="输入关键字进行过滤"
-                  v-model="filterText">
+                  v-model.trim="filterText">
         </el-input>
         <el-scrollbar :style="{height:treeHeight}"
                       class="scrollar">
diff --git a/src/views/modules/plugins/power/kernelhouseholdForm.vue b/src/views/modules/plugins/power/kernelhouseholdForm.vue
index 20f9ea69a..165e00c6d 100644
--- a/src/views/modules/plugins/power/kernelhouseholdForm.vue
+++ b/src/views/modules/plugins/power/kernelhouseholdForm.vue
@@ -6,7 +6,7 @@
           <div class="resi-cell">
             <div class="resi-cell-label">房屋</div>
             <div class="resi-cell-value">
-              <el-input v-model="keyword"
+              <el-input v-model.trim="keyword"
                         style="width:350px"
                         class="resi-cell-input"
                         size="small"
diff --git a/src/views/modules/plugins/power/kernelhouseholdTable.vue b/src/views/modules/plugins/power/kernelhouseholdTable.vue
index fc7efa4db..a5585d9ee 100644
--- a/src/views/modules/plugins/power/kernelhouseholdTable.vue
+++ b/src/views/modules/plugins/power/kernelhouseholdTable.vue
@@ -4,7 +4,7 @@
       <div class="resi-cell">
         <div class="resi-cell-label">党员名称</div>
         <div class="resi-cell-value">
-          <el-input v-model="ownerName"
+          <el-input v-model.trim="ownerName"
                     class="resi-cell-input"
                     size="small"
                     clearable
diff --git a/src/views/modules/plugins/power/poweraxis-add-or-update.vue b/src/views/modules/plugins/power/poweraxis-add-or-update.vue
index ac35c2cb8..75f1821c6 100644
--- a/src/views/modules/plugins/power/poweraxis-add-or-update.vue
+++ b/src/views/modules/plugins/power/poweraxis-add-or-update.vue
@@ -7,7 +7,7 @@
             @keyup.enter.native="dataFormSubmitHandle()" 
             :label-width="$i18n.locale === 'en-US' ? '120px' : '80px'">
       <el-form-item prop="categoryCode" label="类别">
-          <el-select v-model="dataForm.categoryCode" @change="handelChange" placeholder="请选择类别">
+          <el-select v-model.trim="dataForm.categoryCode" @change="handelChange" placeholder="请选择类别">
               <el-option
               v-for="item in structCategoryArr"
               :key="item.categoryCode"
@@ -17,12 +17,12 @@
           </el-select>
       </el-form-item>
       <el-form-item  prop="name" label="名称">
-          <el-input  v-model="dataForm.name" placeholder="请输入名称"  style="width:250px"></el-input>
+          <el-input  v-model.trim="dataForm.name" placeholder="请输入名称"  style="width:250px"></el-input>
       </el-form-item>
       <!-- 下拉框组织的参数 -->
       <el-form-item  prop="agencyId" label="所属组织" v-if="orgListSwitch">
           <el-cascader
-              v-model="dataForm.agencyId"
+              v-model.trim="dataForm.agencyId"
               :options="agencytree"
               placeholder="请选择所属组织"
               :props="{ expandTrigger: 'hover', emitPath: false, label: 'orgName', value: 'orgId', children: 'subOrgList' }"
@@ -33,13 +33,13 @@
           <el-cascader
             placeholder="请选择所属上级"
             :options="parentStructTree"
-            v-model="dataForm.pid"
+            v-model.trim="dataForm.pid"
             :props="{ expandTrigger: 'hover', emitPath: false, label: 'name', value: 'id', children: 'children' }"
             :show-all-levels="false"
             clearable />
       </el-form-item>
       <el-form-item label="排序">
-          <el-input-number v-model="dataForm.sort" :min="0" :max="10" label="请输入排序"></el-input-number>
+          <el-input-number v-model.trim="dataForm.sort" :min="0" :max="10" label="请输入排序"></el-input-number>
       </el-form-item>
       <el-form-item label="活动坐标"
                     prop="longitude"
@@ -55,7 +55,7 @@
                         maxlength="50"
                         size="mini"
                         placeholder="请输入关键字"
-                        v-model="keyWords">
+                        v-model.trim="keyWords">
               </el-input>
               <el-button style="margin-left: 10px"
                           type="primary"
@@ -70,14 +70,14 @@
                       maxlength="50"
                       placeholder="请输入经度"
                       :readonly="true"
-                      v-model="dataForm.longitude">
+                      v-model.trim="dataForm.longitude">
             </el-input>
             <span style="margin-left: 20px">纬度</span>
             <el-input class="item_width_3"
                       maxlength="50"
                       placeholder="请输入纬度"
                       :readonly="true"
-                      v-model="dataForm.latitude">
+                      v-model.trim="dataForm.latitude">
             </el-input>
           </div>
         </div>
diff --git a/src/views/modules/plugins/power/poweraxis.vue b/src/views/modules/plugins/power/poweraxis.vue
index 4ecf03125..2a81eee3a 100644
--- a/src/views/modules/plugins/power/poweraxis.vue
+++ b/src/views/modules/plugins/power/poweraxis.vue
@@ -9,13 +9,13 @@
                       prop="deptName">
           <el-cascader placeholder="请选择所属组织"
                        :options="agencytree"
-                       v-model="dataForm.agencyId"
+                       v-model.trim="dataForm.agencyId"
                        :props="{ expandTrigger: 'hover', emitPath: false, label: 'orgName', value: 'orgId', children: 'subOrgList' }"
                        clearable />
         </el-form-item>
         <el-form-item label="部门名称"
                       prop="deptName">
-          <el-input v-model="dataForm.axisName"
+          <el-input v-model.trim="dataForm.axisName"
                     placeholder="请输入部门名称"
                     clearable
                     size="small" />
diff --git a/src/views/modules/plugins/power/poweraxisForm.vue b/src/views/modules/plugins/power/poweraxisForm.vue
index 9b2b2941e..40e4dd210 100644
--- a/src/views/modules/plugins/power/poweraxisForm.vue
+++ b/src/views/modules/plugins/power/poweraxisForm.vue
@@ -10,7 +10,7 @@
                  class="form">
 
       <el-form-item prop="categoryCode" label="类别" label-width="150px">
-          <el-select class="item_width_1" v-model="dataForm.categoryCode" @change="handelChange" placeholder="请选择类别" clearable>
+          <el-select class="item_width_1" v-model.trim="dataForm.categoryCode" @change="handelChange" placeholder="请选择类别" clearable>
               <el-option
               v-for="item in structCategoryArr"
               :key="item.categoryCode"
@@ -27,14 +27,14 @@
                       maxlength="50"
                       show-word-limit
                       placeholder="请输入名称"
-                      v-model="dataForm.name">
+                      v-model.trim="dataForm.name">
             </el-input>
           </el-form-item>
           <!-- 下拉框组织的参数 -->
           <el-form-item abel-width="150px" prop="agencyId" label="所属组织" v-if="orgListSwitch" label-width="150px">
               <el-cascader
                   class="item_width_1"
-                  v-model="dataForm.agencyId"
+                  v-model.trim="dataForm.agencyId"
                   :options="agencytree"
                   placeholder="请选择所属组织"
                   :props="{ expandTrigger: 'hover', emitPath: false, label: 'orgName', value: 'orgId', children: 'subOrgList' }"
@@ -46,13 +46,13 @@
                 class="item_width_1"
                 placeholder="请选择所属上级"
                 :options="parentStructTree"
-                v-model="dataForm.pid"
+                v-model.trim="dataForm.pid"
                 :props="{ expandTrigger: 'hover', emitPath: false, label: 'name', value: 'id', children: 'children' }"
                 :show-all-levels="false"
                 clearable />
           </el-form-item>
           <el-form-item abel-width="150px" label="排序" label-width="150px">
-              <el-input-number v-model="dataForm.sort" :min="0" :max="10" label="请输入排序"></el-input-number>
+              <el-input-number v-model.trim="dataForm.sort" :min="0" :max="10" label="请输入排序"></el-input-number>
           </el-form-item>
           <el-form-item label="输入位置查坐标"
                         prop="longitude"
@@ -62,7 +62,7 @@
               <el-input class="item_width_4"
                         maxlength="50"
                         placeholder="请输入关键字"
-                        v-model="keyWords">
+                        v-model.trim="keyWords">
               </el-input>
               <el-button style="margin-left: 10px"
                          type="primary"
@@ -76,14 +76,14 @@
                           maxlength="50"
                           placeholder="请输入经度"
                           :readonly="true"
-                          v-model="dataForm.longitude">
+                          v-model.trim="dataForm.longitude">
                 </el-input>
                 <span style="margin-left: 20px">纬度</span>
                 <el-input class="item_width_3"
                           maxlength="50"
                           placeholder="请输入纬度"
                           :readonly="true"
-                          v-model="dataForm.latitude">
+                          v-model.trim="dataForm.latitude">
                 </el-input>
               </div>
             </div>
diff --git a/src/views/modules/plugins/power/poweraxis_add_leader.vue b/src/views/modules/plugins/power/poweraxis_add_leader.vue
index c0bee539f..3a98a63ac 100644
--- a/src/views/modules/plugins/power/poweraxis_add_leader.vue
+++ b/src/views/modules/plugins/power/poweraxis_add_leader.vue
@@ -8,20 +8,20 @@
                   :rules="dataRule"
                   class="form">
             <el-form-item label-width="150px" label="添加方式">
-              <el-radio-group v-model="tagTab" size="small">
+              <el-radio-group v-model.trim="tagTab" size="small">
                 <el-radio-button label="add">编辑</el-radio-button>
                 <el-radio-button label="choose">绑定</el-radio-button>
               </el-radio-group>
             </el-form-item>
             <div v-if="tagTab === 'add'">
               <el-form-item label="类别" label-width="150px" v-if="structLevel || structLevel === 0">
-                  <el-input class="item_width_1" :readonly="true" v-model="categoryName"></el-input>
+                  <el-input class="item_width_1" :readonly="true" v-model.trim="categoryName"></el-input>
               </el-form-item>
               <el-form-item label="名称" prop="name" label-width="150px">
-                  <el-input class="item_width_1" v-model="dataForm.name" placeholder="负责任人名称"></el-input>
+                  <el-input class="item_width_1" v-model.trim="dataForm.name" placeholder="负责任人名称"></el-input>
               </el-form-item>
               <el-form-item label="性别" prop="gender" label-width="150px">
-                <el-select class="item_width_1" v-model="dataForm.gender" clearable placeholder="性别">
+                <el-select class="item_width_1" v-model.trim="dataForm.gender" clearable placeholder="性别">
                   <el-option
                     v-for="item in gender"
                     :key="item.dictValue"
@@ -32,10 +32,10 @@
                 </el-select>
               </el-form-item>
               <el-form-item label="联系方式" label-width="150px">
-                  <el-input class="item_width_1" v-model="dataForm.mobile" placeholder="联系方式"></el-input>
+                  <el-input class="item_width_1" v-model.trim="dataForm.mobile" placeholder="联系方式"></el-input>
               </el-form-item>
               <el-form-item label="简介" prop="interoduction" label-width="150px">
-                  <el-input type="textarea" class="item_width_1" v-model="dataForm.interoduction" placeholder="简介"></el-input>
+                  <el-input type="textarea" class="item_width_1" v-model.trim="dataForm.interoduction" placeholder="简介"></el-input>
               </el-form-item>
               <el-form-item label="头像" label-width="150px">
                 <el-upload :headers="$getElUploadHeaders()"  class="avatar-uploader"
@@ -54,7 +54,7 @@
             </div>
             <div v-if="tagTab === 'choose'">
               <el-form-item label="负责人" label-width="150px" prop="selectleaderId">
-                <el-select class="item_width_1" v-model="dataForm.selectleaderId" clearable placeholder="请选择负责人">
+                <el-select class="item_width_1" v-model.trim="dataForm.selectleaderId" clearable placeholder="请选择负责人">
                   <el-option
                     v-for="item in listbriefArr"
                     :key="item.id"
diff --git a/src/views/modules/plugins/power/poweraxistag-add-or-update.vue b/src/views/modules/plugins/power/poweraxistag-add-or-update.vue
index cf029a4ee..73fa20aa1 100644
--- a/src/views/modules/plugins/power/poweraxistag-add-or-update.vue
+++ b/src/views/modules/plugins/power/poweraxistag-add-or-update.vue
@@ -2,20 +2,20 @@
   <el-dialog :visible.sync="visible" :title="!dataForm.id ? $t('add') : $t('update')" :close-on-click-modal="false" :close-on-press-escape="false">
     <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" :label-width="$i18n.locale === 'en-US' ? '120px' : '80px'">
       <el-form-item label="类别" prop="tagCategory">
-        <el-radio-group v-model="dataForm.tagCategory" size="small">
+        <el-radio-group v-model.trim="dataForm.tagCategory" size="small">
           <el-radio-button label="struct">动力主轴</el-radio-button>
           <el-radio-button label="leader">负责人</el-radio-button>
           <el-radio-button label="param">默认参数</el-radio-button>
         </el-radio-group>
       </el-form-item>
       <el-form-item label="类别编码" prop="categoryCode">
-        <el-input v-model="dataForm.categoryCode" placeholder="标签类别编码"></el-input>
+        <el-input v-model.trim="dataForm.categoryCode" placeholder="标签类别编码"></el-input>
       </el-form-item>
       <el-form-item label="类别属性" prop="categoryName">
-        <el-input v-model="dataForm.categoryName" placeholder="标签类别属性"></el-input>
+        <el-input v-model.trim="dataForm.categoryName" placeholder="标签类别属性"></el-input>
       </el-form-item>
       <el-form-item label="节点等级" prop="structLevel">
-        <el-radio-group v-model="dataForm.structLevel" size="small">
+        <el-radio-group v-model.trim="dataForm.structLevel" size="small">
           <el-radio-button label="0">一级</el-radio-button>
           <el-radio-button label="1">二级</el-radio-button>
           <el-radio-button label="2">三级</el-radio-button>
@@ -23,7 +23,7 @@
       </el-form-item>
       <el-form-item label="禁用" prop="forbiddenFlag">
         <el-switch
-          v-model="dataForm.forbiddenFlag"
+          v-model.trim="dataForm.forbiddenFlag"
           active-color="#ff4949"
           inactive-color="#13ce66"
           active-value="1"
diff --git a/src/views/modules/plugins/power/servicestation.vue b/src/views/modules/plugins/power/servicestation.vue
index f0cbcd9c3..78e075208 100644
--- a/src/views/modules/plugins/power/servicestation.vue
+++ b/src/views/modules/plugins/power/servicestation.vue
@@ -8,7 +8,7 @@
           <el-cascader style="width:350px"
                        placeholder="请选择所属组织"
                        :options="agencytree"
-                       v-model="agencyId"
+                       v-model.trim="agencyId"
                        :props="{ expandTrigger: 'hover', label: 'orgName', value: 'orgId', children: 'subOrgList' }"
                        clearable />
         </el-form-item>
@@ -24,7 +24,7 @@
       <div :style="{height:rowHeight}"
            class="div_tree">
         <el-input placeholder="输入关键字进行过滤"
-                  v-model="filterText">
+                  v-model.trim="filterText">
         </el-input>
         <el-scrollbar :style="{height:treeHeight}"
                       class="scrollar">
diff --git a/src/views/modules/plugins/power/servicestationForm.vue b/src/views/modules/plugins/power/servicestationForm.vue
index 9075e983d..71c0eb237 100644
--- a/src/views/modules/plugins/power/servicestationForm.vue
+++ b/src/views/modules/plugins/power/servicestationForm.vue
@@ -16,7 +16,7 @@
                     maxlength="50"
                     show-word-limit
                     placeholder="请输入服务站名称"
-                    v-model="dataForm.name">
+                    v-model.trim="dataForm.name">
           </el-input>
         </el-form-item>
         <el-form-item label="服务站地址"
@@ -27,7 +27,7 @@
                     maxlength="50"
                     show-word-limit
                     placeholder="请输入服务站地址"
-                    v-model="dataForm.address">
+                    v-model.trim="dataForm.address">
           </el-input>
         </el-form-item>
 
@@ -39,7 +39,7 @@
             <el-input class="item_width_4"
                       maxlength="50"
                       placeholder="请输入关键字"
-                      v-model="keyWords">
+                      v-model.trim="keyWords">
             </el-input>
             <el-button style="margin-left: 10px"
                         type="primary"
@@ -53,20 +53,20 @@
                         maxlength="50"
                         placeholder="请输入经度"
                         :readonly="true"
-                        v-model="dataForm.longitude">
+                        v-model.trim="dataForm.longitude">
               </el-input>
               <span style="margin-left: 20px">纬度</span>
               <el-input class="item_width_3"
                         maxlength="50"
                         placeholder="请输入纬度"
                         :readonly="true"
-                        v-model="dataForm.latitude">
+                        v-model.trim="dataForm.latitude">
               </el-input>
             </div>
           </div>
         </el-form-item>
         <el-form-item label-width="150px" label="排序">
-            <el-input-number v-model="dataForm.sort" :min="0" :max="10" label="请输入排序"></el-input-number>
+            <el-input-number v-model.trim="dataForm.sort" :min="0" :max="10" label="请输入排序"></el-input-number>
         </el-form-item>
       </el-form>
     </div>
diff --git a/src/views/modules/plugins/power/servicestationTable.vue b/src/views/modules/plugins/power/servicestationTable.vue
index 4737a449e..dfc902ae9 100644
--- a/src/views/modules/plugins/power/servicestationTable.vue
+++ b/src/views/modules/plugins/power/servicestationTable.vue
@@ -4,7 +4,7 @@
       <div class="resi-cell">
         <div class="resi-cell-label">服务站名</div>
         <div class="resi-cell-value">
-          <el-input v-model="name"
+          <el-input v-model.trim="name"
                     class="resi-cell-input"
                     size="small"
                     clearable
diff --git a/src/views/modules/plugins/rent/hikerrorinfo-add-or-update.vue b/src/views/modules/plugins/rent/hikerrorinfo-add-or-update.vue
index 752106aef..1ab9fde9d 100644
--- a/src/views/modules/plugins/rent/hikerrorinfo-add-or-update.vue
+++ b/src/views/modules/plugins/rent/hikerrorinfo-add-or-update.vue
@@ -2,34 +2,34 @@
   <el-dialog :visible.sync="visible" :title="!dataForm.id ? $t('add') : $t('update')" :close-on-click-modal="false" :close-on-press-escape="false">
     <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" :label-width="$i18n.locale === 'en-US' ? '120px' : '80px'">
           <el-form-item label="删除标记 0：未删除，1：已删除" prop="delFlag">
-          <el-input v-model="dataForm.delFlag" placeholder="删除标记 0：未删除，1：已删除"></el-input>
+          <el-input v-model.trim="dataForm.delFlag" placeholder="删除标记 0：未删除，1：已删除"></el-input>
       </el-form-item>
           <el-form-item label="乐观锁" prop="revision">
-          <el-input v-model="dataForm.revision" placeholder="乐观锁"></el-input>
+          <el-input v-model.trim="dataForm.revision" placeholder="乐观锁"></el-input>
       </el-form-item>
           <el-form-item label="创建人" prop="createdBy">
-          <el-input v-model="dataForm.createdBy" placeholder="创建人"></el-input>
+          <el-input v-model.trim="dataForm.createdBy" placeholder="创建人"></el-input>
       </el-form-item>
           <el-form-item label="创建时间" prop="createdTime">
-          <el-input v-model="dataForm.createdTime" placeholder="创建时间"></el-input>
+          <el-input v-model.trim="dataForm.createdTime" placeholder="创建时间"></el-input>
       </el-form-item>
           <el-form-item label="更新人" prop="updatedBy">
-          <el-input v-model="dataForm.updatedBy" placeholder="更新人"></el-input>
+          <el-input v-model.trim="dataForm.updatedBy" placeholder="更新人"></el-input>
       </el-form-item>
           <el-form-item label="更新时间" prop="updatedTime">
-          <el-input v-model="dataForm.updatedTime" placeholder="更新时间"></el-input>
+          <el-input v-model.trim="dataForm.updatedTime" placeholder="更新时间"></el-input>
       </el-form-item>
           <el-form-item label="客户ID" prop="customerId">
-          <el-input v-model="dataForm.customerId" placeholder="客户ID"></el-input>
+          <el-input v-model.trim="dataForm.customerId" placeholder="客户ID"></el-input>
       </el-form-item>
           <el-form-item label="证件号" prop="idCard">
-          <el-input v-model="dataForm.idCard" placeholder="证件号"></el-input>
+          <el-input v-model.trim="dataForm.idCard" placeholder="证件号"></el-input>
       </el-form-item>
           <el-form-item label="错误类型 0：token，1：人员，2权限" prop="errorType">
-          <el-input v-model="dataForm.errorType" placeholder="错误类型 0：token，1：人员，2权限"></el-input>
+          <el-input v-model.trim="dataForm.errorType" placeholder="错误类型 0：token，1：人员，2权限"></el-input>
       </el-form-item>
           <el-form-item label="错误详情" prop="errorInfo">
-          <el-input v-model="dataForm.errorInfo" placeholder="错误详情"></el-input>
+          <el-input v-model.trim="dataForm.errorInfo" placeholder="错误详情"></el-input>
       </el-form-item>
       </el-form>
     <template slot="footer">
diff --git a/src/views/modules/plugins/rent/hikerrorinfo.vue b/src/views/modules/plugins/rent/hikerrorinfo.vue
index 0ae95744d..3c6a5dc5f 100644
--- a/src/views/modules/plugins/rent/hikerrorinfo.vue
+++ b/src/views/modules/plugins/rent/hikerrorinfo.vue
@@ -3,7 +3,7 @@
     <div class="mod-hik__hikErrorInfo}">
       <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
         <el-form-item>
-          <el-input v-model="dataForm.id" placeholder="id" clearable></el-input>
+          <el-input v-model.trim="dataForm.id" placeholder="id" clearable></el-input>
         </el-form-item>
         <el-form-item>
           <el-button @click="getDataList()">{{ $t('query') }}</el-button>
diff --git a/src/views/modules/plugins/rent/rentblacklist-add-or-update.vue b/src/views/modules/plugins/rent/rentblacklist-add-or-update.vue
index 999e1f407..3758e30df 100644
--- a/src/views/modules/plugins/rent/rentblacklist-add-or-update.vue
+++ b/src/views/modules/plugins/rent/rentblacklist-add-or-update.vue
@@ -2,52 +2,52 @@
   <el-dialog :visible.sync="visible" :title="!dataForm.id ? $t('add') : $t('update')" :close-on-click-modal="false" :close-on-press-escape="false">
     <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" :label-width="$i18n.locale === 'en-US' ? '120px' : '80px'">
           <el-form-item label="epmet用户主键" prop="userId">
-          <el-input v-model="dataForm.userId" placeholder="epmet用户主键"></el-input>
+          <el-input v-model.trim="dataForm.userId" placeholder="epmet用户主键"></el-input>
       </el-form-item>
           <el-form-item label="姓名" prop="name">
-          <el-input v-model="dataForm.name" placeholder="姓名"></el-input>
+          <el-input v-model.trim="dataForm.name" placeholder="姓名"></el-input>
       </el-form-item>
           <el-form-item label="证件号" prop="idCard">
-          <el-input v-model="dataForm.idCard" placeholder="证件号"></el-input>
+          <el-input v-model.trim="dataForm.idCard" placeholder="证件号"></el-input>
       </el-form-item>
           <el-form-item label="联系电话" prop="mobile">
-          <el-input v-model="dataForm.mobile" placeholder="联系电话"></el-input>
+          <el-input v-model.trim="dataForm.mobile" placeholder="联系电话"></el-input>
       </el-form-item>
           <el-form-item label="性别 0女 1男" prop="gender">
-          <el-input v-model="dataForm.gender" placeholder="性别 0女 1男"></el-input>
+          <el-input v-model.trim="dataForm.gender" placeholder="性别 0女 1男"></el-input>
       </el-form-item>
           <el-form-item label="类型 0 租客 1 房东" prop="type">
-          <el-input v-model="dataForm.type" placeholder="类型 0 租客 1 房东"></el-input>
+          <el-input v-model.trim="dataForm.type" placeholder="类型 0 租客 1 房东"></el-input>
       </el-form-item>
           <el-form-item label="加入时间" prop="joinDate">
-          <el-input v-model="dataForm.joinDate" placeholder="加入时间"></el-input>
+          <el-input v-model.trim="dataForm.joinDate" placeholder="加入时间"></el-input>
       </el-form-item>
           <el-form-item label="加入原因" prop="joinReason">
-          <el-input v-model="dataForm.joinReason" placeholder="加入原因"></el-input>
+          <el-input v-model.trim="dataForm.joinReason" placeholder="加入原因"></el-input>
       </el-form-item>
           <el-form-item label="移除时间" prop="removeDate">
-          <el-input v-model="dataForm.removeDate" placeholder="移除时间"></el-input>
+          <el-input v-model.trim="dataForm.removeDate" placeholder="移除时间"></el-input>
       </el-form-item>
           <el-form-item label="移除原因" prop="removeReason">
-          <el-input v-model="dataForm.removeReason" placeholder="移除原因"></el-input>
+          <el-input v-model.trim="dataForm.removeReason" placeholder="移除原因"></el-input>
       </el-form-item>
           <el-form-item label="删除标记 0：未删除，1：已删除" prop="delFlag">
-          <el-input v-model="dataForm.delFlag" placeholder="删除标记 0：未删除，1：已删除"></el-input>
+          <el-input v-model.trim="dataForm.delFlag" placeholder="删除标记 0：未删除，1：已删除"></el-input>
       </el-form-item>
           <el-form-item label="乐观锁" prop="revision">
-          <el-input v-model="dataForm.revision" placeholder="乐观锁"></el-input>
+          <el-input v-model.trim="dataForm.revision" placeholder="乐观锁"></el-input>
       </el-form-item>
           <el-form-item label="创建人" prop="createdBy">
-          <el-input v-model="dataForm.createdBy" placeholder="创建人"></el-input>
+          <el-input v-model.trim="dataForm.createdBy" placeholder="创建人"></el-input>
       </el-form-item>
           <el-form-item label="创建时间" prop="createdTime">
-          <el-input v-model="dataForm.createdTime" placeholder="创建时间"></el-input>
+          <el-input v-model.trim="dataForm.createdTime" placeholder="创建时间"></el-input>
       </el-form-item>
           <el-form-item label="更新人" prop="updatedBy">
-          <el-input v-model="dataForm.updatedBy" placeholder="更新人"></el-input>
+          <el-input v-model.trim="dataForm.updatedBy" placeholder="更新人"></el-input>
       </el-form-item>
           <el-form-item label="更新时间" prop="updatedTime">
-          <el-input v-model="dataForm.updatedTime" placeholder="更新时间"></el-input>
+          <el-input v-model.trim="dataForm.updatedTime" placeholder="更新时间"></el-input>
       </el-form-item>
       </el-form>
     <template slot="footer">
diff --git a/src/views/modules/plugins/rent/rentblacklist.vue b/src/views/modules/plugins/rent/rentblacklist.vue
index d3a1fc088..02d4dc5ce 100644
--- a/src/views/modules/plugins/rent/rentblacklist.vue
+++ b/src/views/modules/plugins/rent/rentblacklist.vue
@@ -4,7 +4,7 @@
       <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
         <el-form-item label="姓名" label-width="100px"
                       prop="name">
-          <el-input v-model="dataForm.name"
+          <el-input v-model.trim="dataForm.name"
                     size="small"
                     class="list_item_width_1"
                     clearable
@@ -13,7 +13,7 @@
         </el-form-item>
         <el-form-item label="证件号" label-width="100px"
                       prop="idCard">
-          <el-input v-model="dataForm.idCard"
+          <el-input v-model.trim="dataForm.idCard"
                     size="small"
                     class="list_item_width_1"
                     clearable
@@ -22,7 +22,7 @@
         </el-form-item>
         <el-form-item label="联系电话" label-width="100px"
                       prop="mobile">
-          <el-input v-model="dataForm.mobile"
+          <el-input v-model.trim="dataForm.mobile"
                     size="small"
                     class="list_item_width_1"
                     clearable
@@ -31,7 +31,7 @@
         </el-form-item>
         <el-form-item label="入黑名单时间" label-width="100px"
                       prop="startTime">
-          <el-date-picker v-model="timeRange"
+          <el-date-picker v-model.trim="timeRange"
                           type="daterange"
                           clearable
                           size="small"
@@ -83,7 +83,7 @@
         title="解除黑名单的原因"
         :visible.sync="blacklistVisible"
         width="40%">
-        <textarea v-model="blacklistReason" placeholder="请输入解除黑名单的原因" class="blacklist-reason"></textarea>
+        <textarea v-model.trim="blacklistReason" placeholder="请输入解除黑名单的原因" class="blacklist-reason"></textarea>
         <span slot="footer" class="dialog-footer">
           <el-button @click="blacklistVisible = false">取 消</el-button>
           <el-button type="primary" @click="confirmRemoveBlacklist">确 定</el-button>
diff --git a/src/views/modules/plugins/rent/rentcontractfile-add-or-update.vue b/src/views/modules/plugins/rent/rentcontractfile-add-or-update.vue
index dddacc09f..b2c271dd3 100644
--- a/src/views/modules/plugins/rent/rentcontractfile-add-or-update.vue
+++ b/src/views/modules/plugins/rent/rentcontractfile-add-or-update.vue
@@ -2,31 +2,31 @@
   <el-dialog :visible.sync="visible" :title="!dataForm.id ? $t('add') : $t('update')" :close-on-click-modal="false" :close-on-press-escape="false">
     <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" :label-width="$i18n.locale === 'en-US' ? '120px' : '80px'">
           <el-form-item label="引用ID" prop="referenceId">
-          <el-input v-model="dataForm.referenceId" placeholder="引用ID"></el-input>
+          <el-input v-model.trim="dataForm.referenceId" placeholder="引用ID"></el-input>
       </el-form-item>
           <el-form-item label="文件地址" prop="fileUrl">
-          <el-input v-model="dataForm.fileUrl" placeholder="文件地址"></el-input>
+          <el-input v-model.trim="dataForm.fileUrl" placeholder="文件地址"></el-input>
       </el-form-item>
           <el-form-item label="文件类型" prop="fileType">
-          <el-input v-model="dataForm.fileType" placeholder="文件类型"></el-input>
+          <el-input v-model.trim="dataForm.fileType" placeholder="文件类型"></el-input>
       </el-form-item>
           <el-form-item label="删除标识 0：未删除，1：删除" prop="delFlag">
-          <el-input v-model="dataForm.delFlag" placeholder="删除标识 0：未删除，1：删除"></el-input>
+          <el-input v-model.trim="dataForm.delFlag" placeholder="删除标识 0：未删除，1：删除"></el-input>
       </el-form-item>
           <el-form-item label="乐观锁" prop="revision">
-          <el-input v-model="dataForm.revision" placeholder="乐观锁"></el-input>
+          <el-input v-model.trim="dataForm.revision" placeholder="乐观锁"></el-input>
       </el-form-item>
           <el-form-item label="创建人" prop="createdBy">
-          <el-input v-model="dataForm.createdBy" placeholder="创建人"></el-input>
+          <el-input v-model.trim="dataForm.createdBy" placeholder="创建人"></el-input>
       </el-form-item>
           <el-form-item label="创建时间" prop="createdTime">
-          <el-input v-model="dataForm.createdTime" placeholder="创建时间"></el-input>
+          <el-input v-model.trim="dataForm.createdTime" placeholder="创建时间"></el-input>
       </el-form-item>
           <el-form-item label="更新人" prop="updatedBy">
-          <el-input v-model="dataForm.updatedBy" placeholder="更新人"></el-input>
+          <el-input v-model.trim="dataForm.updatedBy" placeholder="更新人"></el-input>
       </el-form-item>
           <el-form-item label="更新时间" prop="updatedTime">
-          <el-input v-model="dataForm.updatedTime" placeholder="更新时间"></el-input>
+          <el-input v-model.trim="dataForm.updatedTime" placeholder="更新时间"></el-input>
       </el-form-item>
       </el-form>
     <template slot="footer">
diff --git a/src/views/modules/plugins/rent/rentcontractfile.vue b/src/views/modules/plugins/rent/rentcontractfile.vue
index 6ff531fb6..822393cc0 100644
--- a/src/views/modules/plugins/rent/rentcontractfile.vue
+++ b/src/views/modules/plugins/rent/rentcontractfile.vue
@@ -4,7 +4,7 @@
       <el-card ref="searchCard" class="search-card">
       <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
         <el-form-item>
-          <el-input v-model="dataForm.id" placeholder="id" clearable></el-input>
+          <el-input v-model.trim="dataForm.id" placeholder="id" clearable></el-input>
         </el-form-item>
         <el-form-item>
           <el-button @click="getDataList()">{{ $t('query') }}</el-button>
diff --git a/src/views/modules/plugins/rent/rentcontractinfo-add-or-update.vue b/src/views/modules/plugins/rent/rentcontractinfo-add-or-update.vue
index e6037d25e..f4c2c1967 100644
--- a/src/views/modules/plugins/rent/rentcontractinfo-add-or-update.vue
+++ b/src/views/modules/plugins/rent/rentcontractinfo-add-or-update.vue
@@ -95,29 +95,29 @@
             </el-form-item>
             <br/>
             <el-form-item label="房主姓名" prop="ownerName">
-                <el-input v-model="dataForm.ownerName" placeholder="房主姓名" style="width: 210px;" disabled></el-input>
+                <el-input v-model.trim="dataForm.ownerName" placeholder="房主姓名" style="width: 210px;" disabled></el-input>
             </el-form-item>
 
         <div style="margin-left: 30px;height: 30px;font-weight: bold;">合同信息</div>
         <div style="margin-left: 50px;height: 30px;">出租人信息</div>
         <el-form-item label="出租人姓名" prop="lessorName" label-width="140px">
-            <el-input v-model="dataForm.lessorName" placeholder="出租人姓名"></el-input>
+            <el-input v-model.trim="dataForm.lessorName" placeholder="出租人姓名"></el-input>
         </el-form-item>
         <el-form-item label="出租人证件号" prop="lessorIdCard" label-width="140px">
-            <el-input v-model="dataForm.lessorIdCard" placeholder="出租人证件号"></el-input>
+            <el-input v-model.trim="dataForm.lessorIdCard" placeholder="出租人证件号"></el-input>
         </el-form-item>
         <el-form-item label="出租人联系电话" prop="lessorMobile" label-width="140px">
-            <el-input v-model="dataForm.lessorMobile" placeholder="出租人联系电话"></el-input>
+            <el-input v-model.trim="dataForm.lessorMobile" placeholder="出租人联系电话"></el-input>
         </el-form-item>
         <el-form-item label="与房主关系" prop="lessorRelation" label-width="140px">
-            <!--<el-input v-model="dataForm.lessorRelation" placeholder="与房主关系"></el-input>-->
-            <el-select v-model="dataForm.lessorRelation" placeholder="与房主关系">
+            <!--<el-input v-model.trim="dataForm.lessorRelation" placeholder="与房主关系"></el-input>-->
+            <el-select v-model.trim="dataForm.lessorRelation" placeholder="与房主关系">
                 <el-option v-for="item in lessorRelationArr" :key="item.dictValue" :label="item.dictName" :value="item.dictValue">
                 </el-option>
             </el-select>
         </el-form-item>
         <el-form-item label="出租人现居住地" prop="lessorLiveAddress" label-width="140px">
-            <el-input v-model="dataForm.lessorLiveAddress" placeholder="出租人现居住地" ></el-input>
+            <el-input v-model.trim="dataForm.lessorLiveAddress" placeholder="出租人现居住地" ></el-input>
         </el-form-item>
         <br/>
         <el-form-item label="中介合同附件" prop="agencyImgList" v-if="dataForm.lessorRelation ==='中介'" label-width="140px">
@@ -129,19 +129,19 @@
 
         <div style="margin-left: 50px;height: 30px;">承租人信息</div>
         <el-form-item label="承租人姓名" prop="lesseeName" label-width="140px">
-            <el-input v-model="dataForm.lesseeName" placeholder="承租人姓名" ></el-input>
+            <el-input v-model.trim="dataForm.lesseeName" placeholder="承租人姓名" ></el-input>
         </el-form-item>
         <el-form-item label="承租人证件号" prop="lesseeIdCard" label-width="140px">
-            <el-input v-model="dataForm.lesseeIdCard" placeholder="承租人证件号" ></el-input>
+            <el-input v-model.trim="dataForm.lesseeIdCard" placeholder="承租人证件号" ></el-input>
         </el-form-item>
         <el-form-item label="承租人联系电话" prop="lesseeMobile" label-width="140px">
-            <el-input v-model="dataForm.lesseeMobile" placeholder="承租人联系电话" ></el-input>
+            <el-input v-model.trim="dataForm.lesseeMobile" placeholder="承租人联系电话" ></el-input>
         </el-form-item>
         <el-form-item label="工作单位" prop="lesseeUnit" label-width="140px">
-            <el-input v-model="dataForm.lesseeUnit" placeholder="工作单位" ></el-input>
+            <el-input v-model.trim="dataForm.lesseeUnit" placeholder="工作单位" ></el-input>
         </el-form-item>
         <el-form-item label="承租人户籍地" label-width="140px">
-            <el-input v-model="dataForm.lesseeHouseAddress" placeholder="承租人户籍地" ></el-input>
+            <el-input v-model.trim="dataForm.lesseeHouseAddress" placeholder="承租人户籍地" ></el-input>
         </el-form-item>
         <br/>
         <div style="padding:20px 30px">
@@ -158,15 +158,15 @@
               <el-table-column prop="name" label="姓名" :render-header="renderHeader" header-align="center" align="center" width="120">
                 <template slot-scope="scope">
                   <el-form-item :prop="'tenantList['+scope.$index+'].name'" required :show-message="false">
-                    <el-input v-model="scope.row.name"></el-input>
+                    <el-input v-model.trim="scope.row.name"></el-input>
                   </el-form-item>
                 </template>
               </el-table-column>
               <el-table-column prop="yfzgx" label="与户主关系" :render-header="renderHeader" header-align="center" align="center" width="120">
                 <template slot-scope="scope">
                   <el-form-item :prop="'tenantList['+scope.$index+'].yfzgx'" required :show-message="false">
-                  <!--<el-input v-model="dataForm.tenantList[scope.$index].yfzgx" placeholder="租客"></el-input>-->
-                    <el-select v-model="scope.row.yfzgx" placeholder="与房主关系">
+                  <!--<el-input v-model.trim="dataForm.tenantList[scope.$index].yfzgx" placeholder="租客"></el-input>-->
+                    <el-select v-model.trim="scope.row.yfzgx" placeholder="与房主关系">
                         <el-option v-for="item in lessorRelationArr" :key="item.dictValue" :label="item.dictName" :value="item.dictValue">
                         </el-option>
                     </el-select>
@@ -176,14 +176,14 @@
               <el-table-column prop="mobile" label="联系电话" :render-header="renderHeader" header-align="center" align="center" width="145">
                 <template slot-scope="scope">
                   <el-form-item :prop="'tenantList['+scope.$index+'].mobile'" required :show-message="false">
-                    <el-input v-model="dataForm.tenantList[scope.$index].mobile"></el-input>
+                    <el-input v-model.trim="dataForm.tenantList[scope.$index].mobile"></el-input>
                   </el-form-item>
                 </template>
               </el-table-column>
               <el-table-column prop="idCard" label="证件号" :render-header="renderHeader" header-align="center" align="center" width="180">
                 <template slot-scope="scope">
                   <el-form-item :prop="'tenantList['+scope.$index+'].idCard'" required :show-message="false">
-                    <el-input v-model="dataForm.tenantList[scope.$index].idCard"></el-input>
+                    <el-input v-model.trim="dataForm.tenantList[scope.$index].idCard"></el-input>
                   </el-form-item>
                 </template>
               </el-table-column>
@@ -191,7 +191,7 @@
               <el-table-column prop="hjszd" label="户籍地" :render-header="renderHeader" header-align="center" align="center" width="180">
                 <template slot-scope="scope">
                   <el-form-item :prop="'tenantList['+scope.$index+'].hjszd'" required :show-message="false">
-                    <el-input v-model="dataForm.tenantList[scope.$index].hjszd"></el-input>
+                    <el-input v-model.trim="dataForm.tenantList[scope.$index].hjszd"></el-input>
                   </el-form-item>
                 </template>
               </el-table-column>
@@ -199,14 +199,14 @@
               <el-table-column prop="unit" label="工作单位" :render-header="renderHeader" header-align="center" align="center" width="180" show-overflow-tooltip>
                 <template slot-scope="scope">
                   <el-form-item :prop="'tenantList['+scope.$index+'].unit'" required :show-message="false">
-                    <el-input v-model="dataForm.tenantList[scope.$index].unit"></el-input>
+                    <el-input v-model.trim="dataForm.tenantList[scope.$index].unit"></el-input>
                   </el-form-item>
                 </template>
               </el-table-column>
               <el-table-column prop="politicalStatus" label="政治面貌" :render-header="renderHeader" header-align="center" align="center" width="120">
                 <template slot-scope="scope">
                   <el-form-item :prop="'tenantList['+scope.$index+'].politicalStatus'" required :show-message="false">
-                    <el-select v-model="dataForm.tenantList[scope.$index].politicalStatus" placeholder="请选择">
+                    <el-select v-model.trim="dataForm.tenantList[scope.$index].politicalStatus" placeholder="请选择">
                       <el-option
                         v-for="item in zzmmOptions"
                         :key="item.value"
@@ -220,7 +220,7 @@
               <el-table-column prop="isMilitary" label="是否服过兵役" :render-header="renderHeader" header-align="center" align="center" width="120">
                 <template slot-scope="scope">
                   <el-form-item :prop="'tenantList['+scope.$index+'].isMilitary'" required :show-message="false">
-                    <el-select v-model="dataForm.tenantList[scope.$index].isMilitary" placeholder="请选择">
+                    <el-select v-model.trim="dataForm.tenantList[scope.$index].isMilitary" placeholder="请选择">
                       <el-option
                         v-for="item in shifouOptions"
                         :key="item.value"
@@ -234,7 +234,7 @@
               <el-table-column prop="nation" label="国籍" :render-header="renderHeader" header-align="center" align="center" width="120">
                 <template slot-scope="scope">
                   <el-form-item :prop="'tenantList['+scope.$index+'].nation'" required :show-message="false">
-                    <el-select v-model="dataForm.tenantList[scope.$index].nation" placeholder="请选择">
+                    <el-select v-model.trim="dataForm.tenantList[scope.$index].nation" placeholder="请选择">
                       <el-option
                         v-for="item in nationOptions"
                         :key="item.value"
@@ -264,8 +264,8 @@
         </div>
         <div style="margin-left: 30px;height: 30px;font-weight: bold;">合同内容</div>
         <el-form-item label="签署日期" prop="signDate" label-width="140px">
-            <!--<el-input v-model="dataForm.signDate" placeholder="签署日期" ></el-input>-->
-            <el-date-picker v-model="dataForm.signDate"
+            <!--<el-input v-model.trim="dataForm.signDate" placeholder="签署日期" ></el-input>-->
+            <el-date-picker v-model.trim="dataForm.signDate"
                             type="date"
                             value-format="yyyy-MM-dd"
                             format="yyyy-MM-dd"
@@ -274,8 +274,8 @@
             </el-date-picker>
         </el-form-item>
         <el-form-item label="合同开始日期" prop="startDate" label-width="140px">
-            <!--<el-input v-model="dataForm.startDate" placeholder="合同开始日期" ></el-input>-->
-            <el-date-picker v-model="dataForm.startDate"
+            <!--<el-input v-model.trim="dataForm.startDate" placeholder="合同开始日期" ></el-input>-->
+            <el-date-picker v-model.trim="dataForm.startDate"
                             type="date"
                             value-format="yyyy-MM-dd"
                             format="yyyy-MM-dd"
@@ -284,8 +284,8 @@
             </el-date-picker>
         </el-form-item>
         <el-form-item label="合同结束日期" prop="endDate" label-width="140px">
-            <!--<el-input v-model="dataForm.endDate" placeholder="合同结束日期" ></el-input>-->
-            <el-date-picker v-model="dataForm.endDate"
+            <!--<el-input v-model.trim="dataForm.endDate" placeholder="合同结束日期" ></el-input>-->
+            <el-date-picker v-model.trim="dataForm.endDate"
                             type="date"
                             value-format="yyyy-MM-dd"
                             format="yyyy-MM-dd"
diff --git a/src/views/modules/plugins/rent/rentcontractinfo-look-or-check.vue b/src/views/modules/plugins/rent/rentcontractinfo-look-or-check.vue
index c5edbe3ba..84dfb8083 100644
--- a/src/views/modules/plugins/rent/rentcontractinfo-look-or-check.vue
+++ b/src/views/modules/plugins/rent/rentcontractinfo-look-or-check.vue
@@ -5,42 +5,42 @@
         <div v-if="dataForm.flag === '2'">
             <div style="margin-left: 50px;height: 30px;font-weight: bold;">房屋信息</div>
             <el-form-item label="所属社区" prop="gridName">
-                <el-input v-model="dataForm.gridName" placeholder="网格" disabled></el-input>
+                <el-input v-model.trim="dataForm.gridName" placeholder="网格" disabled></el-input>
             </el-form-item>
             <el-form-item label="所属网格" prop="gridName">
-                <el-input v-model="dataForm.gridName" placeholder="所属网格" disabled></el-input>
+                <el-input v-model.trim="dataForm.gridName" placeholder="所属网格" disabled></el-input>
             </el-form-item>
             <br/>
             <el-form-item label="房屋" prop="homeName">
-                <el-input v-model="dataForm.homeName" placeholder="房屋" disabled></el-input>
+                <el-input v-model.trim="dataForm.homeName" placeholder="房屋" disabled></el-input>
             </el-form-item>
             <el-form-item label="房主姓名" prop="ownerName">
-                <el-input v-model="dataForm.ownerName" placeholder="房主姓名" disabled></el-input>
+                <el-input v-model.trim="dataForm.ownerName" placeholder="房主姓名" disabled></el-input>
             </el-form-item>
         </div>
 
         <div style="margin-left: 50px;height: 30px;font-weight: bold;">合同信息</div>
         <div style="margin-left: 50px;height: 30px;">出租人信息</div>
         <el-form-item label="出租人姓名" prop="lessorName">
-            <el-input v-model="dataForm.lessorName" placeholder="出租人姓名" disabled></el-input>
+            <el-input v-model.trim="dataForm.lessorName" placeholder="出租人姓名" disabled></el-input>
         </el-form-item>
         <el-form-item label="出租人证件号" prop="lessorIdCard">
-            <el-input v-model="dataForm.lessorIdCard" placeholder="出租人证件号" disabled></el-input>
+            <el-input v-model.trim="dataForm.lessorIdCard" placeholder="出租人证件号" disabled></el-input>
         </el-form-item>
         <br/>
         <el-form-item label="出租人联系电话" prop="lessorMobile">
-            <el-input v-model="dataForm.lessorMobile" placeholder="出租人联系电话" disabled></el-input>
+            <el-input v-model.trim="dataForm.lessorMobile" placeholder="出租人联系电话" disabled></el-input>
         </el-form-item>
         <el-form-item label="与房主关系" prop="lessorRelation">
-            <!--<el-input v-model="dataForm.lessorRelation" placeholder="与房主关系"></el-input>-->
-            <el-select v-model="dataForm.lessorRelation" placeholder="与房主关系" :disabled="dataForm.state !== '0'">
+            <!--<el-input v-model.trim="dataForm.lessorRelation" placeholder="与房主关系"></el-input>-->
+            <el-select v-model.trim="dataForm.lessorRelation" placeholder="与房主关系" :disabled="dataForm.state !== '0'">
                 <el-option v-for="item in lessorRelationArr" :key="item.dictValue" :label="item.dictName" :value="item.dictValue">
                 </el-option>
             </el-select>
         </el-form-item>
         <br/>
         <el-form-item label="出租人现居住地" prop="lessorLiveAddress">
-            <el-input v-model="dataForm.lessorLiveAddress" placeholder="出租人现居住地" disabled></el-input>
+            <el-input v-model.trim="dataForm.lessorLiveAddress" placeholder="出租人现居住地" disabled></el-input>
         </el-form-item>
         <br/>
         <el-form-item label="中介合同附件" prop="agencyImgList" v-if="dataForm.lessorRelation ==='中介'">
@@ -54,21 +54,21 @@
 
         <div style="margin-left: 50px;height: 30px;">承租人信息</div>
         <el-form-item label="承租人姓名" prop="lesseeName">
-            <el-input v-model="dataForm.lesseeName" placeholder="承租人姓名" disabled></el-input>
+            <el-input v-model.trim="dataForm.lesseeName" placeholder="承租人姓名" disabled></el-input>
         </el-form-item>
         <el-form-item label="承租人证件号" prop="lesseeIdCard">
-            <el-input v-model="dataForm.lesseeIdCard" placeholder="承租人证件号" disabled></el-input>
+            <el-input v-model.trim="dataForm.lesseeIdCard" placeholder="承租人证件号" disabled></el-input>
         </el-form-item>
         <br/>
         <el-form-item label="承租人联系电话" prop="lesseeMobile">
-            <el-input v-model="dataForm.lesseeMobile" placeholder="承租人联系电话" disabled></el-input>
+            <el-input v-model.trim="dataForm.lesseeMobile" placeholder="承租人联系电话" disabled></el-input>
         </el-form-item>
         <el-form-item label="工作单位" prop="lesseeUnit">
-            <el-input v-model="dataForm.lesseeUnit" placeholder="工作单位" disabled></el-input>
+            <el-input v-model.trim="dataForm.lesseeUnit" placeholder="工作单位" disabled></el-input>
         </el-form-item>
         <br/>
         <el-form-item label="承租人户籍地" prop="lesseeHouseAddress">
-            <el-input v-model="dataForm.lesseeHouseAddress" placeholder="承租人户籍地" disabled></el-input>
+            <el-input v-model.trim="dataForm.lesseeHouseAddress" placeholder="承租人户籍地" disabled></el-input>
         </el-form-item>
         <br/>
 
@@ -106,14 +106,14 @@
         </div>
         <div style="margin-left: 50px;height: 30px;font-weight: bold;">合同内容</div>
         <el-form-item label="签署日期" prop="signDate">
-            <el-input v-model="dataForm.signDate" placeholder="签署日期" disabled></el-input>
+            <el-input v-model.trim="dataForm.signDate" placeholder="签署日期" disabled></el-input>
         </el-form-item>
         <br/>
         <el-form-item label="合同开始日期" prop="startDate">
-            <el-input v-model="dataForm.startDate" placeholder="合同开始日期" disabled></el-input>
+            <el-input v-model.trim="dataForm.startDate" placeholder="合同开始日期" disabled></el-input>
         </el-form-item>
         <el-form-item label="合同结束日期" prop="endDate">
-            <el-input v-model="dataForm.endDate" placeholder="合同结束日期" disabled></el-input>
+            <el-input v-model.trim="dataForm.endDate" placeholder="合同结束日期" disabled></el-input>
         </el-form-item>
         <br/>
 
@@ -129,7 +129,7 @@
             <label v-for="(item,index) in dataForm.docList" :key="index" @click="downFile(item.fileUrl)" class="file-l">{{ item.name }}</label>
         </el-form-item>
         <el-form-item label="审核原因" prop="reason" v-if="dataForm.flag === '1' && dataForm.state === '2'">
-            <el-input v-model="dataForm.reason" placeholder="审核原因" disabled></el-input>
+            <el-input v-model.trim="dataForm.reason" placeholder="审核原因" disabled></el-input>
         </el-form-item>
 
       </el-form>
@@ -148,7 +148,7 @@
               :visible.sync="checkVisible"
               width="30%"
               append-to-body>
-          <el-input v-model="checkReason" placeholder="请输入审核不通过原因"></el-input>
+          <el-input v-model.trim="checkReason" placeholder="请输入审核不通过原因"></el-input>
           <span slot="footer" class="dialog-footer">
             <el-button @click="checkVisible = false">取 消</el-button>
             <el-button type="primary" @click="dialogCheckHandle" :disabled="disabledBtn">确 定</el-button>
diff --git a/src/views/modules/plugins/rent/rentcontractinfo.vue b/src/views/modules/plugins/rent/rentcontractinfo.vue
index fd492d6e1..5835ec4fc 100644
--- a/src/views/modules/plugins/rent/rentcontractinfo.vue
+++ b/src/views/modules/plugins/rent/rentcontractinfo.vue
@@ -99,33 +99,33 @@
         </el-form-item>
           <br/>
           <el-form-item label="出租人" label-width="100px">
-              <el-input size="small" v-model="dataForm.lessorName" placeholder='出租人' clearable @keyup.native="btKeyUpLessorName"></el-input>
+              <el-input size="small" v-model.trim="dataForm.lessorName" placeholder='出租人' clearable @keyup.native="btKeyUpLessorName"></el-input>
           </el-form-item>
           <el-form-item label="出租人证件号" label-width="100px">
-              <el-input size="small" v-model="dataForm.lessorIdCard" placeholder='出租人证件号' clearable @keyup.native="btKeyUpLessorIdCard"></el-input>
+              <el-input size="small" v-model.trim="dataForm.lessorIdCard" placeholder='出租人证件号' clearable @keyup.native="btKeyUpLessorIdCard"></el-input>
           </el-form-item>
           <el-form-item label="出租人联系电话" label-width="100px">
-              <el-input size="small" v-model="dataForm.lessorMobile" placeholder='出租人联系电话' clearable @keyup.native="btKeyUpLessorMobile"></el-input>
+              <el-input size="small" v-model.trim="dataForm.lessorMobile" placeholder='出租人联系电话' clearable @keyup.native="btKeyUpLessorMobile"></el-input>
           </el-form-item>
           <br/>
           <el-form-item label="承租人" label-width="100px">
-              <el-input size="small" v-model="dataForm.lesseeName" placeholder='承租人' clearable @keyup.native="btKeyUpLesseeName"></el-input>
+              <el-input size="small" v-model.trim="dataForm.lesseeName" placeholder='承租人' clearable @keyup.native="btKeyUpLesseeName"></el-input>
           </el-form-item>
           <el-form-item label="承租人证件号" label-width="100px">
-            <el-input size="small" v-model="dataForm.lesseeIdCard" placeholder='承租人证件号' clearable @keyup.native="btKeyUpLesseeIdCard"></el-input>
+            <el-input size="small" v-model.trim="dataForm.lesseeIdCard" placeholder='承租人证件号' clearable @keyup.native="btKeyUpLesseeIdCard"></el-input>
           </el-form-item>
           <el-form-item label="承租人联系电话" label-width="100px">
-            <el-input size="small" v-model="dataForm.lesseeMobile" placeholder='承租人联系电话' clearable @keyup.native="btKeyUpLesseeMobile"></el-input>
+            <el-input size="small" v-model.trim="dataForm.lesseeMobile" placeholder='承租人联系电话' clearable @keyup.native="btKeyUpLesseeMobile"></el-input>
           </el-form-item>
           <br/>
           <el-form-item label="合同到期时间" prop="endDate" label-width="100px">
-              <el-select size="small" v-model="dataForm.endDate" placeholder="合同到期时间" clearable>
+              <el-select size="small" v-model.trim="dataForm.endDate" placeholder="合同到期时间" clearable>
                   <el-option v-for="item in endDateArr" :key="item.dictValue" :label="item.dictName" :value="item.dictValue">
                   </el-option>
               </el-select>
           </el-form-item>
         <el-form-item label="合同签订时间" prop="startTime" label-width="100px">
-          <el-date-picker v-model="dataForm.startTime"
+          <el-date-picker v-model.trim="dataForm.startTime"
                           type="date" size="small"
                           :picker-options="pickerBeginDateBefore"
                           value-format="yyyy-MM-dd"
@@ -135,7 +135,7 @@
           </el-date-picker>
         </el-form-item>
         <el-form-item label="至" prop="endTime">
-          <el-date-picker v-model="dataForm.endTime"
+          <el-date-picker v-model.trim="dataForm.endTime"
                           type="date" size="small"
                           :picker-options="pickerBeginDateAfter"
                           value-format="yyyy-MM-dd"
diff --git a/src/views/modules/plugins/rent/rentcontractreview.vue b/src/views/modules/plugins/rent/rentcontractreview.vue
index fe6c71fa4..70c7b41ac 100644
--- a/src/views/modules/plugins/rent/rentcontractreview.vue
+++ b/src/views/modules/plugins/rent/rentcontractreview.vue
@@ -99,23 +99,23 @@
         </el-form-item>
         <br/>
         <el-form-item label="审核状态" prop="scanFlag" label-width="100px">
-          <el-select size="small" v-model="dataForm.state" placeholder="审核状态" clearable>
+          <el-select size="small" v-model.trim="dataForm.state" placeholder="审核状态" clearable>
             <el-option v-for="item in stateArr" :key="item.dictValue" :label="item.dictName" :value="item.dictValue">
             </el-option>
           </el-select>
         </el-form-item>
         <el-form-item label="承租人证件号" label-width="110px">
-          <el-input size="small" v-model="dataForm.lesseeIdCard" placeholder='承租人证件号' clearable @keyup.native="btKeyUpLesseeIdCard"></el-input>
+          <el-input size="small" v-model.trim="dataForm.lesseeIdCard" placeholder='承租人证件号' clearable @keyup.native="btKeyUpLesseeIdCard"></el-input>
         </el-form-item>
         <el-form-item label="承租人联系电话" label-width="110px">
-          <el-input size="small" v-model="dataForm.lesseeMobile" placeholder='承租人联系电话' clearable @keyup.native="btKeyUpLesseeMobile"></el-input>
+          <el-input size="small" v-model.trim="dataForm.lesseeMobile" placeholder='承租人联系电话' clearable @keyup.native="btKeyUpLesseeMobile"></el-input>
         </el-form-item>
         <br/>
         <el-form-item label="承租人" label-width="100px">
-          <el-input size="small" v-model="dataForm.lesseeName" placeholder='承租人' clearable @keyup.native="btKeyUpLesseeName"></el-input>
+          <el-input size="small" v-model.trim="dataForm.lesseeName" placeholder='承租人' clearable @keyup.native="btKeyUpLesseeName"></el-input>
         </el-form-item>
         <el-form-item label="审核时间" prop="startTime" label-width="100px">
-          <el-date-picker v-model="dataForm.startTime"
+          <el-date-picker v-model.trim="dataForm.startTime"
                           type="date" size="small"
                           :picker-options="pickerBeginDateBefore"
                           value-format="yyyy-MM-dd"
@@ -125,7 +125,7 @@
           </el-date-picker>
         </el-form-item>
         <el-form-item label="至" prop="endTime">
-          <el-date-picker v-model="dataForm.endTime"
+          <el-date-picker v-model.trim="dataForm.endTime"
                           type="date" size="small"
                           :picker-options="pickerBeginDateAfter"
                           value-format="yyyy-MM-dd"
diff --git a/src/views/modules/plugins/rent/renthouse-add-or-update.vue b/src/views/modules/plugins/rent/renthouse-add-or-update.vue
index f522cf19e..2a682109b 100644
--- a/src/views/modules/plugins/rent/renthouse-add-or-update.vue
+++ b/src/views/modules/plugins/rent/renthouse-add-or-update.vue
@@ -2,49 +2,49 @@
   <el-dialog :visible.sync="visible" :title="!dataForm.id ? $t('add') : '查看'" :close-on-click-modal="false" :close-on-press-escape="false">
     <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" label-width="120px" disabled>
         <el-form-item label="房屋类型" prop="houseType">
-            <el-select v-model="dataForm.houseType" placeholder="房屋类型" clearable>
+            <el-select v-model.trim="dataForm.houseType" placeholder="房屋类型" clearable>
                 <el-option v-for="item in houseTypeArr" :key="item.dictValue" :label="item.dictName" :value="item.dictValue">
                 </el-option>
             </el-select>
         </el-form-item>
         <el-form-item label="用途" prop="purpose">
-            <el-select v-model="dataForm.purpose" placeholder="用途" clearable>
+            <el-select v-model.trim="dataForm.purpose" placeholder="用途" clearable>
                 <el-option v-for="item in purposeArr" :key="item.dictValue" :label="item.dictName" :value="item.dictValue">
                 </el-option>
             </el-select>
         </el-form-item>
         <el-form-item label="房屋状态" prop="rentFlag">
-            <el-select v-model="dataForm.rentFlag" placeholder="房屋状态" clearable>
+            <el-select v-model.trim="dataForm.rentFlag" placeholder="房屋状态" clearable>
                 <el-option v-for="item in rentFlagArr" :key="item.dictValue" :label="item.dictName" :value="item.dictValue">
                 </el-option>
             </el-select>
         </el-form-item>
         <el-form-item label="房主姓名" prop="ownerName">
-            <el-input v-model="dataForm.ownerName" placeholder="房主姓名"></el-input>
+            <el-input v-model.trim="dataForm.ownerName" placeholder="房主姓名"></el-input>
         </el-form-item>
         <el-form-item label="房主电话" prop="ownerPhone">
-            <el-input v-model="dataForm.ownerPhone" placeholder="房主电话"></el-input>
+            <el-input v-model.trim="dataForm.ownerPhone" placeholder="房主电话"></el-input>
         </el-form-item>
         <el-form-item label="房主证件号" prop="ownerIdCard">
-            <el-input v-model="dataForm.ownerIdCard" placeholder="房主证件号"></el-input>
+            <el-input v-model.trim="dataForm.ownerIdCard" placeholder="房主证件号"></el-input>
         </el-form-item>
         <el-form-item label="网格" prop="gridName">
-            <el-input v-model="dataForm.gridName" placeholder="网格"></el-input>
+            <el-input v-model.trim="dataForm.gridName" placeholder="网格"></el-input>
         </el-form-item>
         <el-form-item label="房屋小区" prop="villageName">
-            <el-input v-model="dataForm.villageName" placeholder="房屋小区"></el-input>
+            <el-input v-model.trim="dataForm.villageName" placeholder="房屋小区"></el-input>
         </el-form-item>
         <el-form-item label="楼号" prop="buildName">
-            <el-input v-model="dataForm.buildName" placeholder="楼号"></el-input>
+            <el-input v-model.trim="dataForm.buildName" placeholder="楼号"></el-input>
         </el-form-item>
         <el-form-item label="单元" prop="unitName">
-            <el-input v-model="dataForm.unitName" placeholder="单元"></el-input>
+            <el-input v-model.trim="dataForm.unitName" placeholder="单元"></el-input>
         </el-form-item>
         <el-form-item label="房屋" prop="homeName">
-            <el-input v-model="dataForm.homeName" placeholder="房屋"></el-input>
+            <el-input v-model.trim="dataForm.homeName" placeholder="房屋"></el-input>
         </el-form-item>
         <el-form-item label="购房日期" prop="purchaseDate">
-            <el-date-picker v-model="dataForm.purchaseDate"
+            <el-date-picker v-model.trim="dataForm.purchaseDate"
                             type="date"
                             value-format="yyyy-MM-dd HH:mm:ss"
                             format="yyyy-MM-dd"
diff --git a/src/views/modules/plugins/rent/renthouse.vue b/src/views/modules/plugins/rent/renthouse.vue
index fcd64d58d..059ecab04 100644
--- a/src/views/modules/plugins/rent/renthouse.vue
+++ b/src/views/modules/plugins/rent/renthouse.vue
@@ -101,7 +101,7 @@
         <br/>
         <el-form-item label="姓名" label-width="100px"
                       prop="ownerName">
-          <el-input v-model="dataForm.ownerName"
+          <el-input v-model.trim="dataForm.ownerName"
                     size="small"
                     class="list_item_width_1"
                     clearable
@@ -110,7 +110,7 @@
         </el-form-item>
         <el-form-item label="证件号" label-width="100px"
                       prop="ownerIdCard">
-          <el-input v-model="dataForm.ownerIdCard"
+          <el-input v-model.trim="dataForm.ownerIdCard"
                     size="small"
                     class="list_item_width_1"
                     clearable
@@ -119,7 +119,7 @@
         </el-form-item>
         <el-form-item label="联系电话" label-width="100px"
                       prop="ownerPhone">
-          <el-input v-model="dataForm.ownerPhone"
+          <el-input v-model.trim="dataForm.ownerPhone"
                     size="small"
                     class="list_item_width_1"
                     clearable
@@ -128,14 +128,14 @@
         </el-form-item>
         <br/>
         <el-form-item label="房屋状态" prop="rentFlag" label-width="100px">
-          <el-select size="small" v-model="dataForm.rentFlag" placeholder="房屋状态" clearable>
+          <el-select size="small" v-model.trim="dataForm.rentFlag" placeholder="房屋状态" clearable>
             <el-option v-for="item in rentFlagArr" :key="item.dictValue" :label="item.dictName" :value="item.dictValue">
             </el-option>
           </el-select>
         </el-form-item>
         <el-form-item label="购房时间" label-width="100px"
                       prop="startTime">
-          <el-date-picker v-model="timeRange"
+          <el-date-picker v-model.trim="timeRange"
                           type="daterange"
                           clearable
                           size="small"
diff --git a/src/views/modules/plugins/rent/renthouseForm.vue b/src/views/modules/plugins/rent/renthouseForm.vue
index 1d3929c67..64a8dd091 100644
--- a/src/views/modules/plugins/rent/renthouseForm.vue
+++ b/src/views/modules/plugins/rent/renthouseForm.vue
@@ -103,7 +103,7 @@
         </el-form-item>
 
         <el-form-item label="购房时间" prop="purchaseDate" label-width="150px">
-          <el-date-picker v-model="dataForm.purchaseDate"
+          <el-date-picker v-model.trim="dataForm.purchaseDate"
                           type="date"
                           value-format="yyyy-MM-dd"
                           format="yyyy-MM-dd"
@@ -116,7 +116,7 @@
                       prop="rentFlag"
                       label-width="150px"
                       style="display: block">
-          <el-radio-group v-model="rentFlag">
+          <el-radio-group v-model.trim="rentFlag">
 
             <el-radio :label="1">出租</el-radio>
             <el-radio :label="2">闲置</el-radio>
@@ -131,7 +131,7 @@
                       style="display: block">
           <el-input class="item_width_1"
                     placeholder="请输入房主姓名"
-                    v-model="dataForm.ownerName">
+                    v-model.trim="dataForm.ownerName">
           </el-input>
         </el-form-item>
         <el-form-item label="房主电话"
@@ -141,7 +141,7 @@
           <el-input class="item_width_1"
                     type='number'
                     placeholder="请输入房主电话"
-                    v-model="dataForm.ownerPhone">
+                    v-model.trim="dataForm.ownerPhone">
           </el-input>
         </el-form-item>
         <el-form-item label="房主证件号"
@@ -150,11 +150,11 @@
                       style="display: block">
           <el-input class="item_width_1"
                     placeholder="请输入房主证件号"
-                    v-model="dataForm.ownerIdCard">
+                    v-model.trim="dataForm.ownerIdCard">
           </el-input>
         </el-form-item>
         <el-form-item label=" " prop="needUpdate" label-width="150px">
-          <el-checkbox v-model="needUpdate">更新房屋信息</el-checkbox>
+          <el-checkbox v-model.trim="needUpdate">更新房屋信息</el-checkbox>
         </el-form-item>
       </el-form>
 
diff --git a/src/views/modules/plugins/rent/renttenantinfo-add-or-update.vue b/src/views/modules/plugins/rent/renttenantinfo-add-or-update.vue
index d48c89606..dc8d45dd0 100644
--- a/src/views/modules/plugins/rent/renttenantinfo-add-or-update.vue
+++ b/src/views/modules/plugins/rent/renttenantinfo-add-or-update.vue
@@ -2,16 +2,16 @@
   <el-dialog :visible.sync="visible" :title="dataForm.flag === '1' ? '查看' : '审核'" :close-on-click-modal="false" :close-on-press-escape="false">
     <el-form :model="dataForm" :rules="dataRule" ref="dataForm" label-width="120px">
         <el-form-item label="姓名" prop="name">
-            <el-input v-model="dataForm.name" placeholder="姓名" disabled></el-input>
+            <el-input v-model.trim="dataForm.name" placeholder="姓名" disabled></el-input>
         </el-form-item>
         <el-form-item label="证件号" prop="idCard">
-            <el-input v-model="dataForm.idCard" placeholder="证件号" disabled></el-input>
+            <el-input v-model.trim="dataForm.idCard" placeholder="证件号" disabled></el-input>
         </el-form-item>
         <el-form-item label="联系电话" prop="mobile">
-            <el-input v-model="dataForm.mobile" placeholder="联系电话" disabled></el-input>
+            <el-input v-model.trim="dataForm.mobile" placeholder="联系电话" disabled></el-input>
         </el-form-item>
         <!--<el-form-item label="与房主关系" prop="yfzgx">-->
-            <!--<el-input v-model="dataForm.yfzgx" placeholder="与房主关系" disabled></el-input>-->
+            <!--<el-input v-model.trim="dataForm.yfzgx" placeholder="与房主关系" disabled></el-input>-->
         <!--</el-form-item>-->
         <el-form-item label="证件照片" prop="idCardImgList">
             <template>
@@ -28,7 +28,7 @@
             </template>
         </el-form-item>
         <el-form-item v-if="dataForm.flag === '2'" label="审核原因" prop="reason">
-            <textarea v-model="dataForm.reason" placeholder="请输入审核原因" class="blacklist-reason"></textarea>
+            <textarea v-model.trim="dataForm.reason" placeholder="请输入审核原因" class="blacklist-reason"></textarea>
         </el-form-item>
       </el-form>
     <template slot="footer">
diff --git a/src/views/modules/plugins/rent/renttenantinfo.vue b/src/views/modules/plugins/rent/renttenantinfo.vue
index c5ec1fe73..2c9e19450 100644
--- a/src/views/modules/plugins/rent/renttenantinfo.vue
+++ b/src/views/modules/plugins/rent/renttenantinfo.vue
@@ -3,13 +3,13 @@
       <el-card ref="searchCard" class="search-card">
       <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
         <el-form-item label="姓名" label-width="100px">
-          <el-input size="small" v-model="dataForm.name" placeholder='姓名' clearable @keyup.native="btKeyUpName"></el-input>
+          <el-input size="small" v-model.trim="dataForm.name" placeholder='姓名' clearable @keyup.native="btKeyUpName"></el-input>
         </el-form-item>
         <el-form-item label="证件号" label-width="100px">
-          <el-input size="small" v-model="dataForm.idCard" placeholder='证件号' clearable @keyup.native="btKeyUpIdCard"></el-input>
+          <el-input size="small" v-model.trim="dataForm.idCard" placeholder='证件号' clearable @keyup.native="btKeyUpIdCard"></el-input>
         </el-form-item>
         <el-form-item label="联系电话" label-width="100px">
-          <el-input size="small" v-model="dataForm.mobile" placeholder='联系电话' clearable @keyup.native="btKeyUpMobile"></el-input>
+          <el-input size="small" v-model.trim="dataForm.mobile" placeholder='联系电话' clearable @keyup.native="btKeyUpMobile"></el-input>
         </el-form-item>
         <el-form-item>
           <el-button type="primary" size="small" @click="getDataList()">{{ $t('query') }}</el-button>
@@ -64,7 +64,7 @@
       <!-- 弹窗, 新增 / 修改 -->
       <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update>
       <el-dialog title="审核" :visible.sync="checkVisible" width="40%">
-        <textarea v-model="checkForm.reason" placeholder="请输入审核原因" class="blacklist-reason"></textarea>
+        <textarea v-model.trim="checkForm.reason" placeholder="请输入审核原因" class="blacklist-reason"></textarea>
         <span slot="footer" class="dialog-footer">
           <el-button @click="checkVisible = false">{{ $t('cancel') }}</el-button>
           <el-button type="danger" @click="checkSubmitHandle('2')">{{ $t('checkBTGBtn') }}</el-button>
diff --git a/src/views/modules/plugins/rent/resi.vue b/src/views/modules/plugins/rent/resi.vue
index af035a396..44f70b17e 100644
--- a/src/views/modules/plugins/rent/resi.vue
+++ b/src/views/modules/plugins/rent/resi.vue
@@ -114,7 +114,7 @@
       <div class="div-flex">
         <div class="div_del">
           <!-- <el-checkbox :indeterminate="isIndeterminate"
-                       v-model="selAllFlag"
+                       v-model.trim="selAllFlag"
                        :disabled="selAllFlagDisabled"
                        @change="handleSelectAll">全选</el-checkbox>
           <el-button v-if="selection.length > 0"
@@ -155,7 +155,7 @@
              class="resi-other">
           <div class="resi-other-title">其他</div>
           <div class="tabs-other-info">
-            <el-tabs v-model="activeName"
+            <el-tabs v-model.trim="activeName"
                      @tab-click="handleClick">
               <el-tab-pane v-for="item in tabsList"
                            :key="item.columnName"
@@ -203,7 +203,7 @@
              class="resi-other">
           <div class="resi-other-title">其他</div>
           <div class="tabs-other-info">
-            <el-tabs v-model="activeName"
+            <el-tabs v-model.trim="activeName"
                      @tab-click="handleClick">
               <el-tab-pane v-for="item in tabsList"
                            :key="item.columnName"
@@ -265,7 +265,7 @@
       title="加入黑名单的原因"
       :visible.sync="blacklistVisible"
       width="40%">
-      <textarea v-model="blacklistReason" placeholder="请输入加入黑名单的原因" class="blacklist-reason"></textarea>
+      <textarea v-model.trim="blacklistReason" placeholder="请输入加入黑名单的原因" class="blacklist-reason"></textarea>
       <span slot="footer" class="dialog-footer">
         <el-button @click="blacklistVisible = false">取 消</el-button>
         <el-button type="primary" @click="confirmJoinBlacklist">确 定</el-button>
@@ -278,7 +278,7 @@
 import nextTick from 'dai-js/tools/nextTick'
 import resiSearch from '../../../components/blackSearch.vue'
 import resiForm from '../../../components/resiForm.vue'
-import editResi from '../../../components/editResi.vue'
+import editResi from '../../../components/editResiCopy.vue'
 import axios from 'axios'
 import { mapGetters } from 'vuex'
 import resiTransfer from '../../../components/resiTransfer.vue'
diff --git a/src/views/modules/plugins/stats/factagencyuserhousedaily-add-or-update.vue b/src/views/modules/plugins/stats/factagencyuserhousedaily-add-or-update.vue
index 60e91f4bc..4ee66a84d 100644
--- a/src/views/modules/plugins/stats/factagencyuserhousedaily-add-or-update.vue
+++ b/src/views/modules/plugins/stats/factagencyuserhousedaily-add-or-update.vue
@@ -2,73 +2,73 @@
   <el-dialog :visible.sync="visible" :title="!dataForm.id ? $t('add') : $t('update')" :close-on-click-modal="false" :close-on-press-escape="false">
     <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" :label-width="$i18n.locale === 'en-US' ? '120px' : '80px'">
           <el-form-item label="客户id" prop="customerId">
-          <el-input v-model="dataForm.customerId" placeholder="客户id"></el-input>
+          <el-input v-model.trim="dataForm.customerId" placeholder="客户id"></el-input>
       </el-form-item>
           <el-form-item label="数据更新至：yyyyMMdd; " prop="dateId">
-          <el-input v-model="dataForm.dateId" placeholder="数据更新至：yyyyMMdd; "></el-input>
+          <el-input v-model.trim="dataForm.dateId" placeholder="数据更新至：yyyyMMdd; "></el-input>
       </el-form-item>
           <el-form-item label="组织id" prop="agencyId">
-          <el-input v-model="dataForm.agencyId" placeholder="组织id"></el-input>
+          <el-input v-model.trim="dataForm.agencyId" placeholder="组织id"></el-input>
       </el-form-item>
           <el-form-item label="组织i所属的组织id" prop="pid">
-          <el-input v-model="dataForm.pid" placeholder="组织i所属的组织id"></el-input>
+          <el-input v-model.trim="dataForm.pid" placeholder="组织i所属的组织id"></el-input>
       </el-form-item>
           <el-form-item label="组织i所有上级id" prop="pids">
-          <el-input v-model="dataForm.pids" placeholder="组织i所有上级id"></el-input>
+          <el-input v-model.trim="dataForm.pids" placeholder="组织i所有上级id"></el-input>
       </el-form-item>
           <el-form-item label="小区总数" prop="neighbourhoodsCount">
-          <el-input v-model="dataForm.neighbourhoodsCount" placeholder="小区总数"></el-input>
+          <el-input v-model.trim="dataForm.neighbourhoodsCount" placeholder="小区总数"></el-input>
       </el-form-item>
           <el-form-item label="房屋总数" prop="houseCount">
-          <el-input v-model="dataForm.houseCount" placeholder="房屋总数"></el-input>
+          <el-input v-model.trim="dataForm.houseCount" placeholder="房屋总数"></el-input>
       </el-form-item>
           <el-form-item label="自住房屋总数" prop="houseSelfCount">
-          <el-input v-model="dataForm.houseSelfCount" placeholder="自住房屋总数"></el-input>
+          <el-input v-model.trim="dataForm.houseSelfCount" placeholder="自住房屋总数"></el-input>
       </el-form-item>
           <el-form-item label="出租房屋总数" prop="houseLeaseCount">
-          <el-input v-model="dataForm.houseLeaseCount" placeholder="出租房屋总数"></el-input>
+          <el-input v-model.trim="dataForm.houseLeaseCount" placeholder="出租房屋总数"></el-input>
       </el-form-item>
           <el-form-item label="闲置房屋总数" prop="houseIdleCount">
-          <el-input v-model="dataForm.houseIdleCount" placeholder="闲置房屋总数"></el-input>
+          <el-input v-model.trim="dataForm.houseIdleCount" placeholder="闲置房屋总数"></el-input>
       </el-form-item>
           <el-form-item label="居民总数" prop="userCount">
-          <el-input v-model="dataForm.userCount" placeholder="居民总数"></el-input>
+          <el-input v-model.trim="dataForm.userCount" placeholder="居民总数"></el-input>
       </el-form-item>
           <el-form-item label="常住居民总数" prop="userResiCount">
-          <el-input v-model="dataForm.userResiCount" placeholder="常住居民总数"></el-input>
+          <el-input v-model.trim="dataForm.userResiCount" placeholder="常住居民总数"></el-input>
       </el-form-item>
           <el-form-item label="流动居民总数" prop="userFloatCount">
-          <el-input v-model="dataForm.userFloatCount" placeholder="流动居民总数"></el-input>
+          <el-input v-model.trim="dataForm.userFloatCount" placeholder="流动居民总数"></el-input>
       </el-form-item>
           <el-form-item label="当日新增房屋数" prop="houseIncr">
-          <el-input v-model="dataForm.houseIncr" placeholder="当日新增房屋数"></el-input>
+          <el-input v-model.trim="dataForm.houseIncr" placeholder="当日新增房屋数"></el-input>
       </el-form-item>
           <el-form-item label="当日修改房屋数" prop="houseModify">
-          <el-input v-model="dataForm.houseModify" placeholder="当日修改房屋数"></el-input>
+          <el-input v-model.trim="dataForm.houseModify" placeholder="当日修改房屋数"></el-input>
       </el-form-item>
           <el-form-item label="当日新增居民数" prop="userIncr">
-          <el-input v-model="dataForm.userIncr" placeholder="当日新增居民数"></el-input>
+          <el-input v-model.trim="dataForm.userIncr" placeholder="当日新增居民数"></el-input>
       </el-form-item>
           <el-form-item label="当日修改居民数" prop="userModify">
-          <el-input v-model="dataForm.userModify" placeholder="当日修改居民数"></el-input>
+          <el-input v-model.trim="dataForm.userModify" placeholder="当日修改居民数"></el-input>
       </el-form-item>
           <el-form-item label="删除标识 0未删除、1已删除" prop="delFlag">
-          <el-input v-model="dataForm.delFlag" placeholder="删除标识 0未删除、1已删除"></el-input>
+          <el-input v-model.trim="dataForm.delFlag" placeholder="删除标识 0未删除、1已删除"></el-input>
       </el-form-item>
           <el-form-item label="乐观锁" prop="revision">
-          <el-input v-model="dataForm.revision" placeholder="乐观锁"></el-input>
+          <el-input v-model.trim="dataForm.revision" placeholder="乐观锁"></el-input>
       </el-form-item>
           <el-form-item label="创建人" prop="createdBy">
-          <el-input v-model="dataForm.createdBy" placeholder="创建人"></el-input>
+          <el-input v-model.trim="dataForm.createdBy" placeholder="创建人"></el-input>
       </el-form-item>
           <el-form-item label="创建时间：第一次提交审核的时间，注意和历史表的第一条记录时间一致" prop="createdTime">
-          <el-input v-model="dataForm.createdTime" placeholder="创建时间：第一次提交审核的时间，注意和历史表的第一条记录时间一致"></el-input>
+          <el-input v-model.trim="dataForm.createdTime" placeholder="创建时间：第一次提交审核的时间，注意和历史表的第一条记录时间一致"></el-input>
       </el-form-item>
           <el-form-item label="更新人" prop="updatedBy">
-          <el-input v-model="dataForm.updatedBy" placeholder="更新人"></el-input>
+          <el-input v-model.trim="dataForm.updatedBy" placeholder="更新人"></el-input>
       </el-form-item>
           <el-form-item label="更新时间" prop="updatedTime">
-          <el-input v-model="dataForm.updatedTime" placeholder="更新时间"></el-input>
+          <el-input v-model.trim="dataForm.updatedTime" placeholder="更新时间"></el-input>
       </el-form-item>
       </el-form>
     <template slot="footer">
diff --git a/src/views/modules/plugins/stats/factagencyuserhousedaily.vue b/src/views/modules/plugins/stats/factagencyuserhousedaily.vue
index 06a46e706..0f41424e1 100644
--- a/src/views/modules/plugins/stats/factagencyuserhousedaily.vue
+++ b/src/views/modules/plugins/stats/factagencyuserhousedaily.vue
@@ -29,7 +29,7 @@
         </el-form-item>
         <el-form-item label="时间范围" label-width="100px"
                       prop="startTime">
-          <el-date-picker v-model="timeRange"
+          <el-date-picker v-model.trim="timeRange"
                           type="daterange"
                           clearable
                           size="small"
diff --git a/src/views/modules/plugins/union/customerrelation-add-or-update.vue b/src/views/modules/plugins/union/customerrelation-add-or-update.vue
index cb6e13b4e..d7003fb4c 100644
--- a/src/views/modules/plugins/union/customerrelation-add-or-update.vue
+++ b/src/views/modules/plugins/union/customerrelation-add-or-update.vue
@@ -2,19 +2,19 @@
   <el-dialog :visible.sync="visible" :title="!dataForm.id ? $t('add') : $t('update')" :close-on-click-modal="false" :close-on-press-escape="false">
     <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" :label-width="$i18n.locale === 'en-US' ? '120px' : '80px'">
         <el-form-item label="父级客户" prop="parentCustomerId">
-            <el-select clearable v-model="dataForm.parentCustomerId" placeholder="请选择" @change="changeRootCustomer($event)">
+            <el-select clearable v-model.trim="dataForm.parentCustomerId" placeholder="请选择" @change="changeRootCustomer($event)">
                 <el-option v-for="item in rootCustomer" :key="item.customerId" :label="item.customerName" :value="item.customerId">
                 </el-option>
             </el-select>
         </el-form-item>
         <el-form-item label="子级客户" prop="customerId">
-            <el-select clearable v-model="dataForm.customerId" placeholder="请选择" @change="changeSubCustomer($event)">
+            <el-select clearable v-model.trim="dataForm.customerId" placeholder="请选择" @change="changeSubCustomer($event)">
                 <el-option v-for="item in subCustomer" :key="item.customerId" :label="item.customerName" :value="item.customerId">
                 </el-option>
             </el-select>
         </el-form-item>
         <el-form-item label="是否启用" prop="status">
-            <el-select clearable v-model="dataForm.status" placeholder="请选择">
+            <el-select clearable v-model.trim="dataForm.status" placeholder="请选择">
                 <el-option v-for="item in statusOptions" :key="item.value" :label="item.name" :value="item.value">
                 </el-option>
             </el-select>
diff --git a/src/views/modules/plugins/union/customerrelation.vue b/src/views/modules/plugins/union/customerrelation.vue
index d009bb351..a95fd669c 100644
--- a/src/views/modules/plugins/union/customerrelation.vue
+++ b/src/views/modules/plugins/union/customerrelation.vue
@@ -3,7 +3,7 @@
     <div class="mod-__customerRelation}">
       <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
 <!--        <el-form-item>-->
-<!--          <el-input v-model="dataForm.id" placeholder="id" clearable></el-input>-->
+<!--          <el-input v-model.trim="dataForm.id" placeholder="id" clearable></el-input>-->
 <!--        </el-form-item>-->
 <!--        <el-form-item>-->
 <!--          <el-button @click="getDataList()">{{ $t('query') }}</el-button>-->
diff --git a/src/views/modules/plugins/visit/visitor-add-or-update.vue b/src/views/modules/plugins/visit/visitor-add-or-update.vue
index 736ee9528..4ef8cd35b 100644
--- a/src/views/modules/plugins/visit/visitor-add-or-update.vue
+++ b/src/views/modules/plugins/visit/visitor-add-or-update.vue
@@ -2,43 +2,43 @@
   <el-dialog :visible.sync="visible" :title="!dataForm.id ? $t('add') : $t('update')" :close-on-click-modal="false" :close-on-press-escape="false">
     <el-form disabled :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" :label-width="$i18n.locale === 'en-US' ? '120px' : '80px'">
           <el-form-item label="姓名" prop="name">
-          <el-input v-model="dataForm.name" placeholder="姓名"></el-input>
+          <el-input v-model.trim="dataForm.name" placeholder="姓名"></el-input>
       </el-form-item>
           <el-form-item label="证件号" prop="idCard">
-          <el-input v-model="dataForm.idCard" placeholder="证件号"></el-input>
+          <el-input v-model.trim="dataForm.idCard" placeholder="证件号"></el-input>
       </el-form-item>
           <el-form-item label="性别" prop="gender">
-              <el-radio-group v-model="dataForm.gender">
+              <el-radio-group v-model.trim="dataForm.gender">
                   <el-radio :label="'0'">{{ $t('user.gender1') }}</el-radio>
                   <el-radio :label="'1'">{{ $t('user.gender0') }}</el-radio>
               </el-radio-group>
       </el-form-item>
           <el-form-item label="联系电话" prop="mobile">
-          <el-input v-model="dataForm.mobile" placeholder="联系电话"></el-input>
+          <el-input v-model.trim="dataForm.mobile" placeholder="联系电话"></el-input>
       </el-form-item>
           <el-form-item label="人员类型" prop="type">
-              <el-radio-group v-model="dataForm.gender">
+              <el-radio-group v-model.trim="dataForm.gender">
                   <el-radio :label="'0'">{{ '访客' }}</el-radio>
                   <el-radio :label="'1'">{{ '租客' }}</el-radio>
               </el-radio-group>
       </el-form-item>
           <el-form-item label="来访事由" prop="visitReason">
-          <el-input type="textarea" v-model="dataForm.visitReason" placeholder="来访事由"></el-input>
+          <el-input type="textarea" v-model.trim="dataForm.visitReason" placeholder="来访事由"></el-input>
       </el-form-item>
           <el-form-item label="头像" prop="faceImg">
               <el-image :src="dataForm.faceImg" @click="imgShow(dataForm.faceImg)" style="width: 100px; height: 100px" />
       </el-form-item>
           <el-form-item label="小区" prop="residential">
-          <el-input v-model="dataForm.residential" placeholder="小区"></el-input>
+          <el-input v-model.trim="dataForm.residential" placeholder="小区"></el-input>
       </el-form-item>
           <el-form-item label="楼栋" prop="building">
-          <el-input v-model="dataForm.building" placeholder="楼栋"></el-input>
+          <el-input v-model.trim="dataForm.building" placeholder="楼栋"></el-input>
       </el-form-item>
           <el-form-item label="单元" prop="unit">
-          <el-input v-model="dataForm.unit" placeholder="单元"></el-input>
+          <el-input v-model.trim="dataForm.unit" placeholder="单元"></el-input>
       </el-form-item>
           <el-form-item label="房屋" prop="room">
-          <el-input v-model="dataForm.room" placeholder="房屋"></el-input>
+          <el-input v-model.trim="dataForm.room" placeholder="房屋"></el-input>
       </el-form-item>
       </el-form>
     <template slot="footer">
diff --git a/src/views/modules/plugins/visit/visitvisitor-add-or-update.vue b/src/views/modules/plugins/visit/visitvisitor-add-or-update.vue
index 736ee9528..4ef8cd35b 100644
--- a/src/views/modules/plugins/visit/visitvisitor-add-or-update.vue
+++ b/src/views/modules/plugins/visit/visitvisitor-add-or-update.vue
@@ -2,43 +2,43 @@
   <el-dialog :visible.sync="visible" :title="!dataForm.id ? $t('add') : $t('update')" :close-on-click-modal="false" :close-on-press-escape="false">
     <el-form disabled :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" :label-width="$i18n.locale === 'en-US' ? '120px' : '80px'">
           <el-form-item label="姓名" prop="name">
-          <el-input v-model="dataForm.name" placeholder="姓名"></el-input>
+          <el-input v-model.trim="dataForm.name" placeholder="姓名"></el-input>
       </el-form-item>
           <el-form-item label="证件号" prop="idCard">
-          <el-input v-model="dataForm.idCard" placeholder="证件号"></el-input>
+          <el-input v-model.trim="dataForm.idCard" placeholder="证件号"></el-input>
       </el-form-item>
           <el-form-item label="性别" prop="gender">
-              <el-radio-group v-model="dataForm.gender">
+              <el-radio-group v-model.trim="dataForm.gender">
                   <el-radio :label="'0'">{{ $t('user.gender1') }}</el-radio>
                   <el-radio :label="'1'">{{ $t('user.gender0') }}</el-radio>
               </el-radio-group>
       </el-form-item>
           <el-form-item label="联系电话" prop="mobile">
-          <el-input v-model="dataForm.mobile" placeholder="联系电话"></el-input>
+          <el-input v-model.trim="dataForm.mobile" placeholder="联系电话"></el-input>
       </el-form-item>
           <el-form-item label="人员类型" prop="type">
-              <el-radio-group v-model="dataForm.gender">
+              <el-radio-group v-model.trim="dataForm.gender">
                   <el-radio :label="'0'">{{ '访客' }}</el-radio>
                   <el-radio :label="'1'">{{ '租客' }}</el-radio>
               </el-radio-group>
       </el-form-item>
           <el-form-item label="来访事由" prop="visitReason">
-          <el-input type="textarea" v-model="dataForm.visitReason" placeholder="来访事由"></el-input>
+          <el-input type="textarea" v-model.trim="dataForm.visitReason" placeholder="来访事由"></el-input>
       </el-form-item>
           <el-form-item label="头像" prop="faceImg">
               <el-image :src="dataForm.faceImg" @click="imgShow(dataForm.faceImg)" style="width: 100px; height: 100px" />
       </el-form-item>
           <el-form-item label="小区" prop="residential">
-          <el-input v-model="dataForm.residential" placeholder="小区"></el-input>
+          <el-input v-model.trim="dataForm.residential" placeholder="小区"></el-input>
       </el-form-item>
           <el-form-item label="楼栋" prop="building">
-          <el-input v-model="dataForm.building" placeholder="楼栋"></el-input>
+          <el-input v-model.trim="dataForm.building" placeholder="楼栋"></el-input>
       </el-form-item>
           <el-form-item label="单元" prop="unit">
-          <el-input v-model="dataForm.unit" placeholder="单元"></el-input>
+          <el-input v-model.trim="dataForm.unit" placeholder="单元"></el-input>
       </el-form-item>
           <el-form-item label="房屋" prop="room">
-          <el-input v-model="dataForm.room" placeholder="房屋"></el-input>
+          <el-input v-model.trim="dataForm.room" placeholder="房屋"></el-input>
       </el-form-item>
       </el-form>
     <template slot="footer">
diff --git a/src/views/modules/plugins/visit/visitvisitor.vue b/src/views/modules/plugins/visit/visitvisitor.vue
index d89c32ea1..4efe0760f 100644
--- a/src/views/modules/plugins/visit/visitvisitor.vue
+++ b/src/views/modules/plugins/visit/visitvisitor.vue
@@ -4,17 +4,17 @@
       <el-card ref="searchCard" class="search-card">
       <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
         <el-form-item label="姓名" label-width="100px">
-          <el-input v-model="dataForm.name" placeholder='姓名' clearable></el-input>
+          <el-input v-model.trim="dataForm.name" placeholder='姓名' clearable></el-input>
         </el-form-item>
         <el-form-item label="证件号" label-width="100px">
-          <el-input v-model="dataForm.idCard" placeholder='证件号' clearable></el-input>
+          <el-input v-model.trim="dataForm.idCard" placeholder='证件号' clearable></el-input>
         </el-form-item>
         <el-form-item label="联系方式" label-width="100px">
-          <el-input v-model="dataForm.mobile" placeholder='联系方式' clearable></el-input>
+          <el-input v-model.trim="dataForm.mobile" placeholder='联系方式' clearable></el-input>
         </el-form-item>
         <br/>
         <el-form-item label="来访时间" prop="startTime" label-width="100px">
-          <el-date-picker v-model="dataForm.startTime"
+          <el-date-picker v-model.trim="dataForm.startTime"
                           type="datetime"
                           :picker-options="pickerBeginDateBefore"
                           value-format="yyyy-MM-dd HH:mm:ss"
@@ -24,7 +24,7 @@
           </el-date-picker>
         </el-form-item>
         <el-form-item label="至" prop="endTime">
-          <el-date-picker v-model="dataForm.endTime"
+          <el-date-picker v-model.trim="dataForm.endTime"
                           type="datetime"
                           :picker-options="pickerBeginDateAfter"
                           value-format="yyyy-MM-dd HH:mm:ss"
@@ -34,7 +34,7 @@
           </el-date-picker>
         </el-form-item>
         <el-form-item label="所属社区" label-width="100px">
-          <el-input disabled v-model="dataForm.agency" placeholder='所属社区' clearable></el-input>
+          <el-input disabled v-model.trim="dataForm.agency" placeholder='所属社区' clearable></el-input>
         </el-form-item>
         <br/>
         <el-form-item label="所属小区"
diff --git a/src/views/modules/portrayal/fangwu/cpts/leftTop.vue b/src/views/modules/portrayal/fangwu/cpts/leftTop.vue
deleted file mode 100644
index 4c9af268c..000000000
--- a/src/views/modules/portrayal/fangwu/cpts/leftTop.vue
+++ /dev/null
@@ -1,108 +0,0 @@
-<template>
-    <div class=''>
-        <div class="item f-font14">
-            <span class="label gray">房主姓名：</span><span class="value">{{ houseInfo.ownerName || "--" }}</span>
-        </div>
-        <div class="item f-font14">
-            <span class="label gray">联系电话：</span><span class="value">{{ houseInfo.ownerPhone || "--" }}</span>
-        </div>
-        <div class="item f-font14">
-            <span class="label gray">房屋类型：</span><span class="value">{{ houseInfo.houseTypeName || "--" }}</span>
-        </div>
-        <div class="item f-font14">
-            <span class="label gray">用途：</span><span class="value">{{ houseInfo.purposeName || "--" }}</span>
-        </div>
-        <div class="item f-font14">
-            <span class="label gray">家庭类别：</span><span class="value">{{ familyTagsStr || "--" }}</span>
-        </div>
-        <div class="item f-font14">
-            <span class="label gray">房屋状态：</span><span class="value">{{ houseInfo.rentName || "--" }}</span>
-        </div>
-        <div class="item f-font14">
-            <span class="label gray">家庭预警：</span>
-            <span class="value">{{ houseInfo.riskFlag === '1' ? '满意度风险家庭' : '--' }}</span>
-        </div>
-    </div>
-</template>
-
-<script>
-import { requestPost, requestGet } from '@/js/dai/request'
-export default {
-    //数据
-    data() {
-        return {
-            houseInfo: {},
-            family_tag: [],
-            familyTagsStr:''
-        };
-    },
-    //创建前
-    created() {
-        this.getDictOptions()
-    },
-    mounted() {
-        this.getPersonalFile()
-    },
-    props: {
-        houseId: {
-            type: String,
-            default: ''
-        },
-    },
-    watch: {
-        houseId: {
-            handler(newVal, oldVal) {
-                this.getPersonalFile()
-            }
-        }
-    },
-    //方法
-    methods: {
-        async getPersonalFile() {
-            let url = `/actual/base/communityHouse/getMaskedHouseDeatilById/` + this.houseId
-            let { code, data, msg } = await requestPost(url)
-            if (code == 0) {
-                this.houseInfo = data
-
-                const valuesToMatch = this.houseInfo.familyTags;
-                console.log(valuesToMatch);
-                const result = this.family_tag
-                    .filter(item => valuesToMatch.includes(item.value))
-                    .map(item => item.label)
-                    .join(',');
-                this.familyTagsStr = result
-                console.log(result);
-
-            } else {
-                this.$message.error(msg)
-            }
-        },
-        async getDictOptions() {
-            const url = "/sys/dict/data/dictlist"
-
-            let params = {
-                dictType: 'family_tag'
-            }
-
-            const { data, code, msg } = await requestPost(url, params)
-
-            if (code === 0) {
-                this.family_tag = data;
-            } else {
-                this.$message.error(msg)
-            }
-        }
-    },
-    //子组件注册
-    components: {},
-    //计算
-    computed: {},
-    //监听
-    watch: {},
-}
-</script>
-
-<style lang="scss" scoped>
-@import "@/assets/scss/pages/huaxiang";
-@import "@/assets/scss/modules/management/list-main.scss";
-</style>
diff --git a/src/views/modules/portrayal/fangwu/cpts/rightBto.vue b/src/views/modules/portrayal/fangwu/cpts/rightBto.vue
deleted file mode 100644
index 181af5549..000000000
--- a/src/views/modules/portrayal/fangwu/cpts/rightBto.vue
+++ /dev/null
@@ -1,69 +0,0 @@
-<template>
-    <div class="table">
-      <el-table v-if="list.length > 0" :data="list" max-height="390px" height="390px">
-        <el-table-column label="序号" type="index" width="80" />
-        <el-table-column label="变更人" prop="resiName" width="140" />
-        <el-table-column label="变更类型" prop="typeName" width="" />
-        <el-table-column label="变更前" prop="beforeChange" width="120" />
-        <el-table-column label="变更后" prop="afterChange" width="120" />
-        <el-table-column label="操作人" prop="operatorName" width="120" />
-        <el-table-column label="调整时间" prop="changeTime" width="190" />
-      </el-table>
-  
-      <div v-else style="width: 100%; height: 100%; text-align: center; padding-top: 120px">
-        <img width="268px" height="128px" src="~@/assets/images/overview/zanwu.png" />
-        <div style="color: #fff">暂无数据</div>
-      </div>
-    </div>
-  </template>
-  
-  <script>
-  export default {
-    props: {
-        houseId: {
-        type: String,
-        default:''
-      },
-    },
-    data() {
-      return {
-        list: [],
-        total: 0,
-      };
-    },
-    created() {
-      this.getList();
-    },
-    watch: {
-    },
-    methods: {
-      getList() {
-       
-        // 办理状态(-2：未知，-1：不接受回访，0：接受回访/待回访，1已回访)
-        const completeFlags = {
-          "-2": "未知",
-          "-1": "不接受回访",
-          0: "接受回访/待回访",
-          1: "已回访",
-        };
-        // 省满意度列表
-        this.$http.get("/actual/base/peopleRoomOverview/houseResidentChangeRecord?houseId=" + this.houseId).then(({ data: res }) => {
-          this.list = res.data.map((item) => {
-            return {
-              ...item,
-              completeFlag: completeFlags[item.completeFlag],
-            };
-          });
-          this.total = res.data.length;
-        });
-      },
-    },
-  };
-  </script>
-  
-  <style scoped lang="scss">
-  .business-records {
-    margin-bottom: 25px;
-  }
-  </style>
-  
\ No newline at end of file
diff --git a/src/views/modules/portrayal/fangwu/index.vue b/src/views/modules/portrayal/fangwu/index.vue
deleted file mode 100644
index 917df3664..000000000
--- a/src/views/modules/portrayal/fangwu/index.vue
+++ /dev/null
@@ -1,118 +0,0 @@
-<template>
-    <div class='g-main'>
-        <div class="top">
-            <div class="left">
-                <div class="card">
-                    <div class="title">
-                        <div><img src="../../../../assets/images/index/title-icon-sqzl.png" alt="">家庭标签</div>
-                    </div>
-                    <div class="f-top12">
-                        <img src="../../../../assets/images/index/house.png" alt="" width="56px"> {{ houseInfo.fullName }}
-                    </div>
-                    <section class="bgC">
-                        <left-top :houseId="houseInfo.houseId" :key="houseInfo.houseId"></left-top>
-                    </section>
-                </div>
-            </div>
-            <div class="right">
-                <div class="card">
-                    <div class="title">
-                        <div><img src="../../../../assets/images/index/title-icon-ywjl.png" alt="">各项业务记录</div>
-                    </div>
-                    <right-top v-if="childrenFlag" :houseInfo="houseInfo" :familyResiList="familyResiList" :type="'1'"
-                        :key="houseInfo.houseId"></right-top>
-                </div>
-            </div>
-        </div>
-        <div class="bottom">
-            <div class="left">
-                <div class="card">
-                    <div class="title">
-                        <div><img src="../../../../assets/images/index/title-icon-jtgx.png" alt="">家庭关系</div>
-                    </div>
-                    <section class="bgC" style="padding: 0;">
-                        <left-bto :houseInfo="houseInfo" :type="'1'" :key="houseInfo.houseId"></left-bto>
-                    </section>
-                </div>
-            </div>
-            <div class="right">
-                <div class="card   right16">
-                    <div class="title">
-                        <div><img src="../../../../assets/images/index/title-icon-rkbh.png" alt="">人口变化情况</div>
-                    </div>
-                    <div>
-                        <right-bto :houseId="houseInfo.houseId"  :key="houseInfo.houseId" />
-                    </div>
-                </div>
-            </div>
-        </div>
-    </div>
-</template>
-<script>
-import { requestPost, requestGet } from '@/js/dai/request'
-import leftTop from "./cpts/leftTop";
-import leftBto from "../jumin/cpts/leftBto";
-import rightTop from "../jumin/cpts/rightTop";
-import rightBto from "./cpts/rightBto";
-import nextTick from "dai-js/tools/nextTick";
-
-
-export default {
-    //数据
-    data() {
-        return {
-            houseInfo: {},
-            showedResiInfo: false,
-            familyResiList: [],
-            childrenFlag: false
-        };
-    },
-    //创建前
-    async created() {
-        this.houseInfo = this.$store.state.huaXiang.houseInfo
-        await this.getFamilyRelationshipList()
-    },
-    mounted() {
-    },
-    activated() {
-        this.houseInfo = this.$store.state.huaXiang.houseInfo
-        this.getFamilyRelationshipList()
-    },
-
-    watch: {
-        '$route': function (to, from) {
-            if (to.path != '/main/fangwu-huaxiang') {
-                this.childrenFlag = false
-            }
-        }
-    },
-    //方法
-    methods: {
-        async getFamilyRelationshipList() {
-            let url = `/actual/base/peopleRoomOverview/getFamilyRelationshipList?type=1&resid=` + this.houseInfo.houseId
-            let { code, data, msg } = await requestPost(url)
-            if (code == 0) {
-                this.familyResiList = data.map(item => item.id)
-            } else {
-                this.$message.error(msg)
-            }
-            this.childrenFlag = true
-        },
-
-        changeTotal(val) {
-            this.total = val.total
-        },
-    },
-    //子组件注册
-    // leftTop, leftBto, resiInfo, rightTop, pointsRecord, rightBto, xiangshoufuwu
-    components: { leftTop, leftBto, rightTop, rightBto },
-    //计算
-    computed: {},
-    //监听
-}
-</script>
-
-<style lang="scss" scoped>
-@import "@/assets/scss/pages/huaxiang";
-@import "@/assets/scss/modules/management/list-main.scss";
-</style>
diff --git a/src/views/modules/portrayal/house/cpts/businessRecord.vue b/src/views/modules/portrayal/house/cpts/businessRecord.vue
new file mode 100644
index 000000000..c88fb37a7
--- /dev/null
+++ b/src/views/modules/portrayal/house/cpts/businessRecord.vue
@@ -0,0 +1,295 @@
+<template>
+  <div style="padding:0 16px;margin-top: 7px;">
+    <el-tabs v-model.trim="topTabs" @tab-click="tabClick">
+      <el-tab-pane :label="complainLabel" name="12345">
+        <complain :tableData="complainList" />
+      </el-tab-pane>
+      <el-tab-pane :label="shengLabel" name="sheng">
+        <sheng :tableData="shengList" />
+      </el-tab-pane>
+      <el-tab-pane :label="shequLabel" name="shequ">
+        <shequ :tableData="shequList" />
+      </el-tab-pane>
+      <el-tab-pane :label="shijianLabel" name="shijian">
+        <shijian :tableData="shijianList" />
+      </el-tab-pane>
+      <el-tab-pane :label="xuqiuLabel" name="xuqiu">
+        <xuqiu :tableData="xuqiuList" />
+      </el-tab-pane>
+      <el-tab-pane :label="fuwuLabel" name="fuwu">
+        <div style="display: flex; flex-direction: column; height: 100%">
+          <fuwu
+            :tableData="fuwuList"
+            style="flex: 1; overflow: auto"
+          />
+        </div>
+      </el-tab-pane>
+    </el-tabs>
+  </div>
+</template>
+
+<script>
+import complain from "./table/complain";
+import sheng from "./table/sheng";
+import shequ from "./table/shequ";
+import shijian from "./table/shijian";
+import xuqiu from "./table/xuqiu";
+import fuwu from "./table/fuwu";
+export default {
+  //数据
+  data() {
+    return {
+      topTabs: "12345",
+
+      complainTotal: 0,
+      complainList: [],
+      complainLabel: "",
+
+      shengLabel: "",
+      shengList: [],
+      shengTotal: 0,
+
+      shequLabel: "",
+      shequList: [],
+      shequTotal: 0,
+
+      shijianLabel: "",
+      shijianList: [],
+      shijianTotal: 0,
+
+      xuqiuLabel: "",
+      xuqiuList: [],
+      xuqiuTotal: 0,
+
+      fuwuLabel: "",
+      fuwuList: [],
+      fuwuTotal: 0,
+
+      pageNo: 1,
+      pageSize: 20,
+    };
+  },
+  //创建前
+  created() {
+  },
+  async mounted() {
+    // 获取家庭所有成员
+    console.log(this.familyResiList,'aaa');
+
+    await this.getComplainList();
+    await this.getShengList();
+    await this.getShequList();
+    await this.getshijianList();
+    await this.getxuqiuList();
+    await this.getfuwuList();
+  },
+  props: {
+    houseId: {
+      type: String,
+      default: () => {},
+    },
+    familyResiList: {
+      type: Array,
+      default: () => [],
+    },
+   
+  },
+
+  watch:{
+    "familyResiList": {
+      handler(newValue, oldValue) {
+         this.getComplainList();
+         this.getShengList();
+         this.getShequList();
+         this.getshijianList();
+         this.getxuqiuList();
+         this.getfuwuList();
+      },
+      deep: true, // 开启深度监听
+      immediate: true, // 立即触发一次handler
+    },
+  },
+  //方法
+  methods: {
+    tabClick(index) {},
+    handleSizeChange() {},
+    handleCurrentChange() {},
+    getComplainList() {
+      console.log(this.familyResiList);
+      if (this.familyResiList.length == 0) {
+        this.complainList = [];
+        this.complainLabel = `12345投诉（0）`;
+        return;
+      }
+      let parm = {
+        residList: this.familyResiList,
+        pageNo: this.pageNo,
+        pageSize: this.pageSize,
+        eventType: "3",
+      };
+      const statusArr = {
+        processing: "处理中",
+        closed_case: "已办结",
+      };
+      const marktypes = ["普通事件", "难点读点", "矛盾纠纷", "自身问题"];
+
+      // 省满意度列表
+      this.$http
+        .post("/actual/base/peopleRoomOverview/eventPageList", parm)
+        .then(({ data: res }) => {
+          this.complainList = res.data.list.map((item) => {
+            return {
+              ...item,
+              status: item.status ? statusArr[item.status] : null,
+              marktype: marktypes[item.marktype],
+            };
+          });
+          this.complainTotal = res.data.total;
+
+          this.complainLabel = `12345投诉（${this.complainTotal}）`;
+        });
+    },
+    getShengList() {
+      if (this.familyResiList.length == 0) {
+        this.shengList = [];
+        this.shengLabel = `省满意度调查（0）`;
+        return;
+      }
+      let parm = {
+        residList: this.familyResiList,
+        pageNo: this.pageNo,
+        pageSize: this.pageSize,
+      };
+      // 省满意度列表
+      this.$http
+        .post(
+          "/actual/base/peopleRoomOverview/provincialSatisfactionPageList",
+          parm
+        )
+        .then(({ data: res }) => {
+          this.shengList = res.data;
+          this.shengTotal = res.data.length;
+          this.shengLabel = `省满意度调查（${this.shengTotal}）`;
+        });
+    },
+    getShequList() {
+      if (this.familyResiList.length == 0) {
+        this.shequList = [];
+        this.shequLabel = `社区满意度自查（0）`;
+        return;
+      }
+      let parm = {
+        residList: this.familyResiList,
+        pageNo: this.pageNo,
+        pageSize: this.pageSize,
+      };
+      const completeFlags = {
+        "-2": "未知",
+        "-1": "不接受回访",
+        0: "接受回访/待回访",
+        1: "已回访",
+      };
+      this.$http
+        .post(
+          "/actual/base/peopleRoomOverview/communitySatisfactionPageList",
+          parm
+        )
+        .then(({ data: res }) => {
+          this.shequList = res.data.map((item) => {
+            return {
+              ...item,
+              completeFlag: completeFlags[item.completeFlag],
+            };
+          });
+          this.shequTotal = this.shequList.length;
+          this.shequLabel = `社区满意度自查（${this.shequTotal}）`;
+        });
+    },
+    getshijianList() {
+      if (this.familyResiList.length == 0) {
+        this.shijianList = [];
+        this.shijianLabel = `上报事件（0）`;
+        return;
+      }
+      let parm = {
+        residList: this.familyResiList,
+        pageNo: this.pageNo,
+        pageSize: this.pageSize,
+      };
+      const statusArr = {
+        processing: "处理中",
+        closed_case: "已办结",
+      };
+      const marktypes = ["普通事件", "难点读点", "矛盾纠纷", "自身问题"];
+      this.$http
+        .post("/actual/base/peopleRoomOverview/eventPageList", parm)
+        .then(({ data: res }) => {
+          this.shijianList = res.data.list.map((item) => {
+            return {
+              ...item,
+              status: item.status ? statusArr[item.status] : null,
+              marktype: marktypes[item.marktype],
+            };
+          });
+          this.shijianTotal = this.shijianList.length;
+          this.shijianLabel = `上报事件（${this.shijianTotal}）`;
+        });
+    },
+    getxuqiuList() {
+      if (this.familyResiList.length == 0) {
+        this.xuqiuList = [];
+        this.xuqiuLabel = `居民需求（0）`;
+        return;
+      }
+      let parm = {
+        residList: this.familyResiList,
+        pageNo: this.pageNo,
+        pageSize: this.pageSize,
+      };
+      // 省满意度列表
+      this.$http
+        .post("/actual/base/peopleRoomOverview/demandOfResidentsPageList", parm)
+        .then(({ data: res }) => {
+          this.xuqiuList = res.data.map((item) => {
+            return {
+              ...item,
+            };
+          });
+          this.xuqiuTotal = this.xuqiuList.length;
+          this.xuqiuLabel = `居民需求（${this.xuqiuTotal}）`;
+        });
+    },
+    getfuwuList() {
+      if (this.familyResiList.length == 0) {
+        this.fuwuList = [];
+        this.fuwuLabel = `社区服务（0）`;
+        return;
+      }
+      let parm = {
+        residList: this.familyResiList,
+        pageNo: this.pageNo,
+        pageSize: this.pageSize,
+      };
+      this.$http
+        .post("/actual/base/peopleRoomOverview/communityServicePageList", parm)
+        .then(({ data: res }) => {
+          this.fuwuList = res.data.map((item) => {
+            return {
+              ...item,
+            };
+          });
+          this.fuwuTotal = this.fuwuList.length;
+          this.fuwuLabel = `社区服务（${this.fuwuTotal}）`;
+        });
+    },
+
+     
+  },
+  //子组件注册
+  components: { complain, sheng, fuwu, shijian, xuqiu, shequ },
+  //计算
+  computed: {},
+};
+</script>
+
+<style lang="less" scoped></style>
\ No newline at end of file
diff --git a/src/views/modules/portrayal/house/cpts/details/fwdetail.vue b/src/views/modules/portrayal/house/cpts/details/fwdetail.vue
new file mode 100644
index 000000000..7a7a7caf1
--- /dev/null
+++ b/src/views/modules/portrayal/house/cpts/details/fwdetail.vue
@@ -0,0 +1,206 @@
+<template>
+  <el-dialog width="818px" :modal="true" :modal-append-to-body="false" :destroy-on-close="true" :visible="showDialog"
+    @close="handleClose" title="服务详情">
+    <div class="eventWrap">
+      <el-row :gutter="32">
+        <el-col :span="23" style="padding-left: 40px">
+          <div class="leftEvent">
+            <div class="eventItem">
+              <span>所属组织：</span>
+              <span>{{ formData.principalName || '--' }}</span>
+            </div>
+            <div class="eventItem">
+              <span>服务类型：</span>
+              <span>{{
+                formData.customerId && getFwType(formData.customerId)
+              }}</span>
+            </div>
+            <div class="eventItem">
+              <span>服务事项：</span>
+              <span>{{ formData.serviceName || '--' }}</span>
+            </div>
+            <div class="eventItem">
+              <span>服务时间：</span>
+              <span>{{ formData.serviceTimeStart || '--' }} ~
+                {{ formData.serviceTimeEnd || '--' }}</span>
+            </div>
+            <div class="eventItem">
+              <span>服务内容：</span>
+              <span style="margin-top: 20px">{{ formData.remark || '--' }}</span>
+            </div>
+            <div class="eventItem">
+              <span>经办人：</span>
+              <span>{{ formData.principalName || '--' }}</span>
+            </div>
+            <div class="eventItem">
+              <span>联系电话：</span>
+              <span> {{ $sensitive(formData.principalContact, 3, 7) }}</span>
+            </div>
+            <div class="eventItem">
+              <span>服务组织：</span>
+              <span>{{ formData.principalName || '--' }}</span>
+            </div>
+            <div class="eventItem">
+              <span>政策依据：</span>
+              <span>{{ formData.policyTitle || '--' }}</span>
+            </div>
+          </div>
+        </el-col>
+      </el-row>
+    </div>
+  </el-dialog>
+</template>
+  
+<script>
+export default {
+  name: "ReportAnEvent",
+  components: {
+  },
+  props: {
+    id: {
+      type: String,
+      default: "",
+    },
+    showDialog: {
+      type: Boolean,
+      default: false,
+    },
+  },
+
+  data() {
+    return {
+      item: {},
+      loading: false,
+      activities: [],
+
+
+      // 服务类型。
+      serviceTypesLevel1: [],
+      formData: {}
+    };
+  },
+
+  computed: {},
+  watch: {
+    showDialog: {
+      handler(val) {
+        if (val) {
+          this.getDetailsData(this.id);
+        }
+      },
+      immediate: true,
+    },
+  },
+  mounted() {
+    this.$http
+      .get("/governance/commonServiceType/selectList/0")
+      .then(({ data: res }) => {
+        if (res.code !== 0) {
+          return this.$message.error(res.msg);
+        } else {
+          this.serviceTypesLevel1 = res.data;
+        }
+      })
+      .catch(() => {
+        return this.$message.error("网络错误");
+      });
+  },
+
+  methods: {
+    handleClose() {
+      this.$emit("close", false);
+      this.item = {};
+    },
+
+    openImg(src) {
+      window.open(src);
+    },
+
+    getTrueTime(time) {
+      return this.$moment(time * 1000).format("YYYY-MM-DD hh:mm");
+    },
+
+    getFwType(value) {
+      if (this.serviceTypesLevel1.length > 0 && value) {
+        return this.serviceTypesLevel1.filter(
+          (item) => item.customerId == value
+        )[0].name;
+      }
+      return "";
+    },
+    getDetailsData(id) {
+      this.loading = true;
+      this.$http
+        .post("/governance/icServiceRecordV2/detail", {
+          serviceRecordId: id,
+        })
+        .then((res) => {
+          const { code, data, msg } = res.data;
+          if (code === 0) {
+            this.formData = data;
+            this.loading = false;
+          } else {
+            this.loading = false;
+            this.$message.error(msg);
+          }
+        });
+      // this.$http
+      //   .post("/governance/icEvent/process", { icEventId: id })
+      //   .then((res) => {
+      //     const { code, data, msg } = res.data;
+      //     if (code === 0) {
+      //       this.activities = data;
+      //     } else {
+      //       this.$message.error(msg);
+      //     }
+      //   });
+    },
+  },
+};
+</script>
+  
+  
+<style lang="scss" scoped>
+@import "@/assets/scss/modules/shequzhili/event-info.scss";
+
+.eventWrap {
+  width: 1094px;
+  max-height: 798px;
+  overflow-y: auto;
+  overflow-x: hidden;
+  padding: 24px;
+
+  .eventDetails {
+    font-size: 18px;
+    margin: 48px 24px 48px 0;
+
+    img {
+      margin-top: -4px;
+      margin-right: 8px;
+    }
+  }
+
+  .m-info {
+    padding: 0px !important;
+
+    .m-process {
+      margin: 0 !important;
+
+      .detail {
+        .detail-field {
+          flex: none !important;
+        }
+      }
+    }
+  }
+
+  .leftEvent {
+    .eventItem {
+      font-size: 14px;
+      margin-bottom: 24px;
+
+    }
+  }
+}
+</style>
+  
\ No newline at end of file
diff --git a/src/views/modules/portrayal/house/cpts/details/shengdetail.vue b/src/views/modules/portrayal/house/cpts/details/shengdetail.vue
new file mode 100644
index 000000000..e8835661e
--- /dev/null
+++ b/src/views/modules/portrayal/house/cpts/details/shengdetail.vue
@@ -0,0 +1,189 @@
+<template>
+    <el-dialog width="818px" :modal="true" :modal-append-to-body="false" :destroy-on-close="true" :visible="showDialog"
+        @close="handleClose" title="省满意度调查不满意事项详情">
+        <div class="eventWrap">
+            <el-row :gutter="32">
+                <el-col :span="23" style="padding-left: 40px">
+                    <div class="leftEvent">
+                        <div class="eventItem">
+                            <span>所属组织：</span>
+                            <span>{{ item.agencyName || '--' }}</span>
+                        </div>
+                        <div class="eventItem">
+                            <span>不满意事项来源：</span>
+                            <span>省满意度调查</span>
+                        </div>
+                        <div class="eventItem">
+                            <span>不满意事项类型：</span>
+                            <span>{{ item.scopeId && getSxType(item.scopeId) }}</span>
+                        </div>
+                        <div class="eventItem">
+                            <span>所属月份：</span>
+                            <span>{{
+                                item.createdTime && getMonthData(item.createdTime)
+                            }}</span>
+                        </div>
+                        <div class="eventItem">
+                            <div>不满意事项描述：</div>
+                            <div style="margin-top: 20px">{{ item.problemDesc || '--' }}</div>
+                        </div>
+                        <div class="eventItem">
+                            <span>提交人姓名：</span>
+                            <span>{{ item.name || '--' }}</span>
+                        </div>
+                        <div class="eventItem">
+                            <span>提交人电话：</span>
+                            <span> {{ $sensitive(item.mobile, 3, 7) }}</span>
+                        </div>
+                        <div class="eventItem">
+                            <span>完成时限：</span>
+                            <span>{{ item.completeTime || '--' }}</span>
+                        </div>
+                    </div>
+                </el-col>
+            </el-row>
+        </div>
+    </el-dialog>
+</template>
+  
+<script>
+
+export default {
+    components: {
+    },
+    props: {
+        id: {
+            type: String,
+            default: "",
+        },
+        showDialog: {
+            type: Boolean,
+            default: false,
+        },
+    },
+
+    data() {
+        return {
+            item: {
+                logList: [],
+            },
+            loading: false,
+            loading1: false,
+            activities: [],
+            // 不满意类型列表
+            satisfactionCategoryOptions: [],
+        };
+    },
+    computed: {},
+    watch: {
+        showDialog: {
+            handler(val) {
+                if (val) {
+                    this.getDetailsData(this.id);
+                }
+            },
+            immediate: true,
+        },
+    },
+    mounted() { },
+
+    methods: {
+        handleClose() {
+            this.$emit("close", false);
+            this.item = {};
+        },
+
+        openImg(src) {
+            window.open(src);
+        },
+
+        getTrueTime(time) {
+            return this.$moment(time * 1000).format("YYYY-MM-DD hh:mm");
+        },
+
+        getSxType(value) {
+            if (this.satisfactionCategoryOptions.length > 0 && value) {
+                return this.satisfactionCategoryOptions.filter(
+                    (item) => item.value == value
+                )[0].label;
+            }
+            return "";
+        },
+        getMonthData(time) {
+            if (time) {
+                return this.$moment(time).format("YYYY年MM月");
+            }
+            return "";
+        },
+        getDetailsData(id) {
+            this.loading = true;
+            this.$http
+                .post("/governance/provinceEvaluationRecord/" + id)
+                .then((res) => {
+                    this.loading = false;
+                    const { code, data, msg } = res.data;
+                    if (code === 0) {
+                        this.item = data;
+                    } else {
+                        this.$message.error(msg);
+                    }
+                });
+            this.$http
+                .get(
+                    "/governance/satisfactionDetailList/getUnsatisfiedCategory?satisfactionSource="
+                )
+                .then(({ data: { data } }) => {
+                    this.satisfactionCategoryOptions = data.map((item) => {
+                        return {
+                            label: item.categoryName,
+                            value: item.categoryCode,
+                        };
+                    });
+                });
+        },
+    },
+};
+</script>
+  
+  
+<style lang="scss" scoped>
+@import "@/assets/scss/modules/shequzhili/event-info.scss";
+
+.eventWrap {
+    width: 1094px;
+    max-height: 798px;
+    overflow-y: auto;
+    overflow-x: hidden;
+    padding: 24px;
+
+    .eventDetails {
+        font-size: 18px;
+        margin: 48px 24px 48px 0;
+
+        img {
+            margin-top: -4px;
+            margin-right: 8px;
+        }
+    }
+    .m-info {
+        padding: 0px !important;
+
+        .m-process {
+            margin: 0 !important;
+            .detail {
+                .detail-field {
+                    flex: none !important;
+                }
+            }
+        }
+    }
+
+    .leftEvent {
+        .eventItem {
+            font-size: 14px;
+            margin-bottom: 24px;
+        }
+    }
+}
+</style>
+  
\ No newline at end of file
diff --git a/src/views/modules/portrayal/house/cpts/details/sjdetail.vue b/src/views/modules/portrayal/house/cpts/details/sjdetail.vue
new file mode 100644
index 000000000..84c3084b7
--- /dev/null
+++ b/src/views/modules/portrayal/house/cpts/details/sjdetail.vue
@@ -0,0 +1,306 @@
+<template>
+  <el-dialog width="1118px" :modal="true" :modal-append-to-body="false" :destroy-on-close="true" :visible="showDialog"
+    @close="handleClose" title="事件详情">
+    <div class="eventWrap">
+      <el-row :gutter="32">
+        <el-col :span="13" style="padding-left: 40px">
+          <div class="leftEvent">
+
+            <div class="eventItem">
+              <span>所属组织：</span>
+              <span>{{ item.gridName || '--' }}</span>
+            </div>
+            <div class="eventItem">
+              <span>上报渠道：</span>
+              <span>{{ item.sourceTypeName || '--' }}</span>
+            </div>
+            <div class="eventItem">
+              <span>事件类型：</span>
+              <span>{{ item.categoryName || '--' }}</span>
+            </div>
+            <div class="eventItem">
+              <span>接受时间：</span>
+              <span>{{ item.happenTime || '--' }}</span>
+            </div>
+            <!--            <div class="eventItem">
+                            <span>工单号：</span>
+                            <span>{{ item.workOrderNum }}</span>
+                          </div>-->
+            <div class="eventItem">
+              <div>问题描述：</div>
+              <div style="margin-top: 20px">{{ item.eventContent || '--' }}</div>
+            </div>
+            <!--            <div class="eventItem">
+                            <div>图片：</div>
+                            <div style="margin-top: 20px; display: flex">
+                              <img
+                                style="width: 100px; height: 100px; margin-right: 5px"
+                                v-for="src in item.imageList"
+                                :key="src"
+                                :src="src"
+                                alt="/"
+                                @click="openImg(src)"
+                              />
+                            </div>
+                          </div>-->
+            <div class="eventItem">
+              <span>联系人：</span>
+              <span>{{ item.name || '--' }}</span>
+            </div>
+            <div class="eventItem">
+              <span>联系电话：</span>
+              <span>{{ item.mobile || '--' }}</span>
+            </div>
+            <div class="eventItem">
+              <span>详细地址：</span>
+              <span>{{ item.address || '--' }}</span>
+            </div>
+            <div class="eventItem">
+              <span>办结时限：</span>
+              <span>{{ item.latestOperatedTime || '--' }}</span>
+            </div>
+            <div class="eventItem">
+              <span>满意度评价：</span>
+              <span>{{ item.satisfactionName || '--' }}</span>
+            </div>
+          </div>
+        </el-col>
+        <el-col :span="11">
+          <div class="rightEvent m-info">
+            <!-- <div class="eventDetails">
+              <img :width="18" :height="18" src="@/assets/images/manyidu/tc-title-icon.png" />办理进展
+            </div> -->
+            <!-- <el-timeline class="timeline" :reverse="true">
+                  <el-timeline-item v-for="(item, index) in activities" :key="index" :class="index == activities.length - 1 ? 'sucess' : ''">
+                    <div class="status-box">
+                      <div class="status1" v-if="index == activities.length - 1">回复</div>
+                      <div class="status2" v-else>完成并回复</div>
+                      <div class="timestamp">{{ item.timeLimit ? $moment(item.timeLimit).format("YYYY-MM-DD hh:mm:ss") : "" }}</div>
+                    </div>
+                    <div class="content">
+                      <div class="field">回复人：</div>
+                      <div class="value">{{ item.departmentName }}</div>
+                    </div>
+                    <div class="content">
+                      <div class="field">回复内容：</div>
+                      <div class="value">{{ item.publicReply }}</div>
+                    </div>
+                  </el-timeline-item>
+                </el-timeline> -->
+            <div v-if="activities.length > 0">
+              <!-- <el-card :class="{ 'box-card': source === 'visiual' }" style="min-height: calc(88vh - 50px); overflow: auto"> -->
+              <div class="m-process">
+                <div class="list">
+                  <div class="item" :class="[index === 0 ? 'z-on' : '']" :key="item.processId"
+                    v-for="(item, index) in activities">
+                    <div class="item-row">
+                      <template v-if="item.agencyId">
+                        <div class="name">指派</div>
+                      </template>
+                      <template v-if="!item.timeLimit">
+                        <div class="name">完成并回复</div>
+                      </template>
+                      <template v-if="!item.agencyId && item.timeLimit">
+                        <div class="name">{{ item.processName || '--' }}</div>
+                      </template>
+                      <div class="date">
+                        {{
+                          item.processTime ? getTrueTime(item.processTime) : ""
+                        }}
+                      </div>
+                    </div>
+                    <div v-if="item.type === 'event'">
+                      <template v-if="item.agencyId">
+                        <div class="detail">
+                          <div class="detail-field">指派人：</div>
+                          <div class="detail-value">
+                            {{ item.departmentName || '--' }}
+                          </div>
+                        </div>
+                        <div class="detail">
+                          <div class="detail-field">指派部门：</div>
+                          <div class="detail-value">
+                            {{ item.agencyName || '--' }}
+                          </div>
+                        </div>
+                        <div class="detail">
+                          <div class="detail-field">转办意见：</div>
+                          <div class="detail-value">
+                            {{ item.publicReply || '--' }}
+                          </div>
+                        </div>
+                        <div class="detail">
+                          <div class="detail-field">办结时限：</div>
+                          <div class="detail-value">
+                            {{ item.timeLimit || '--' }}
+                          </div>
+                        </div>
+                      </template>
+                      <template v-else>
+                        <div class="detail">
+                          <div class="detail-field">回复人：</div>
+                          <div class="detail-value">
+                            {{ item.departmentName || '--' }}
+                          </div>
+                        </div>
+                        <div class="detail">
+                          <div class="detail-field">回复内容：</div>
+                          <div class="detail-value">
+                            {{ item.publicReply || '--' }}
+                          </div>
+                        </div>
+                        <div class="detail" v-if="item.timeLimit">
+                          <div class="detail-field">办结时限：</div>
+                          <div class="detail-value">
+                            {{ getTrueTime(item.timeLimit) }}
+                          </div>
+                        </div>
+                      </template>
+                    </div>
+                  </div>
+                </div>
+              </div>
+              <!-- </el-card> -->
+            </div>
+          </div>
+        </el-col>
+      </el-row>
+    </div>
+  </el-dialog>
+</template>
+  
+<script>
+export default {
+  name: "ReportAnEvent",
+  components: {
+  },
+  props: {
+    id: {
+      type: String,
+      default: "",
+    },
+    showDialog: {
+      type: Boolean,
+      default: false,
+    },
+  },
+
+  data() {
+    return {
+      item: {},
+      loading: false,
+      loading1: false,
+      activities: [],
+    };
+  },
+
+  computed: {},
+  watch: {
+    showDialog: {
+      handler(val) {
+        if (val) {
+          this.getDetailsData(this.id);
+          this.getProcessData(this.id);
+        } else {
+          this.item = {}
+          this.activities = []
+        }
+      },
+      immediate: true,
+    },
+  },
+  mounted() {
+  },
+
+  methods: {
+    handleClose() {
+      this.$emit("close", false);
+      this.item = {};
+    },
+
+    openImg(src) {
+      window.open(src);
+    },
+
+    getTrueTime(time) {
+      return this.$moment(time * 1000).format("YYYY-MM-DD hh:mm");
+    },
+
+    getDetailsData(id) {
+      this.loading = true;
+      this.$http
+        .post("/governance/icEvent/detail", { icEventId: id })
+        .then((res) => {
+          const { code, data, msg } = res.data;
+          if (code === 0) {
+            this.item = data;
+            this.loading = false;
+          } else {
+            this.loading = false;
+            this.$message.error(msg);
+          }
+        });
+    },
+
+    getProcessData(id) {
+      this.$http
+        .post("/governance/icEvent/process", { icEventId: id })
+        .then((res) => {
+          const { code, data, msg } = res.data;
+          if (code === 0) {
+            this.activities = data;
+            this.loading1 = false;
+          } else {
+            this.loading1 = false;
+            this.$message.error(msg);
+          }
+        });
+    },
+  },
+};
+</script>
+  
+<style lang="scss" scoped>
+@import "@/assets/scss/modules/shequzhili/event-info.scss";
+
+.eventWrap {
+  width: 1094px;
+  overflow-y: auto;
+  overflow-x: hidden;
+  padding: 24px;
+
+  .eventDetails {
+    font-size: 18px;
+    margin: 48px 24px 48px 0;
+
+    img {
+      margin-top: -4px;
+      margin-right: 8px;
+    }
+  }
+
+  .m-info {
+    padding: 0px !important;
+
+    .m-process {
+      margin: 0 !important;
+
+      .detail {
+        .detail-field {
+          flex: none !important;
+        }
+      }
+    }
+  }
+
+  .leftEvent {
+    .eventItem {
+      font-size: 14px;
+      margin-bottom: 24px;
+
+      span:first-child {}
+    }
+  }
+}
+</style>
+  
\ No newline at end of file
diff --git a/src/views/modules/portrayal/house/cpts/details/sqdetail.vue b/src/views/modules/portrayal/house/cpts/details/sqdetail.vue
new file mode 100644
index 000000000..b718abe25
--- /dev/null
+++ b/src/views/modules/portrayal/house/cpts/details/sqdetail.vue
@@ -0,0 +1,283 @@
+<template>
+    <el-dialog
+      width="818px"
+      :modal="true"
+      :modal-append-to-body="false"
+      :destroy-on-close="true"
+      :visible="showDialog"
+      @close="handleClose"
+      title="社区满意度自查不满意事项详情"
+    >
+      <div class="eventWrap">
+        <el-row :gutter="32">
+          <el-col :span="24" style="padding-left: 40px">
+          </el-col>
+          <el-col
+            :span="23"
+            style="padding-left: 40px"
+          >
+            <div class="leftEvent">
+              
+              <!-- <div class="eventItem">
+                <span>所属组织：</span>
+                <span>{{ item.agencyName }}</span>
+              </div> -->
+              <div class="eventItem">
+                <span>不满意事项来源：</span>
+                <span>社区意度自查</span>
+              </div>
+              <div class="eventItem">
+                <span>不满意事项类型：</span>
+                <span>{{ getSxType(item) }}</span>
+              </div>
+              <!-- <div class="eventItem">
+                <span>所属月份：</span>
+                <span>{{
+                  item.createdTime && getMonthData(item.createdTime)
+                }}</span>
+              </div> -->
+              <div class="eventItem">
+                <div>不满意事项描述：</div>
+                <div style="margin-top: 20px">{{ getSxReason(item) }}</div>
+              </div>
+              <div class="eventItem">
+                <span>提交人姓名：</span>
+                <span>{{ item.reporterName || '--' }}</span>
+              </div>
+              <div class="eventItem">
+                <span>提交人电话：</span>
+                <span> {{ $sensitive(item.reporterMobile, 3, 7) }}</span>
+              </div>
+              <!-- <div class="eventItem">
+                <span>完成时限：</span>
+                <span>{{ item.completeTime }}</span>
+              </div> -->
+            </div>
+          </el-col>
+        </el-row>
+      </div>
+    </el-dialog>
+  </template>
+  
+  <script>
+  
+  export default {
+    components: {
+    },
+    props: {
+      id: {
+        type: String,
+        default: "",
+      },
+      showDialog: {
+        type: Boolean,
+        default: false,
+      },
+    },
+  
+    data() {
+      return {
+        item: {
+          logList: [],
+        },
+        loading: false,
+        // 不满意类型列表
+        satisfactionCategoryOptions: [
+          {
+            key: "evaCulturalFacility",
+            value: "文化设施",
+          },
+          {
+            key: "evaSportsFacility",
+            value: "体育设施",
+          },
+          {
+            key: "evaEcologicalEnv",
+            value: "生态环境",
+          },
+          {
+            key: "evaSocialSecurity",
+            value: "社会治安",
+          },
+          {
+            key: "evaocialAssistance",
+            value: "社会救助",
+          },
+          {
+            key: "evaOldPeopleProvide",
+            value: "老有所养",
+          },
+          {
+            key: "evaBasicEducation",
+            value: "基础教育",
+          },
+          {
+            key: "evaMedical",
+            value: "病有所医",
+          },
+        ],
+        reason: [
+          "basicEducationReason",
+          "culturalFacilityReason",
+          "ecologicalEnvReason",
+          "medicalReason",
+          "oldPeopleProvideReason",
+          "socialAssistanceReason",
+          "socialSecurityReason",
+          "sportsFacilityReason",
+        ],
+      };
+    },
+  
+    computed: {},
+    watch: {
+      showDialog: {
+        handler(val) {
+          if (val) {
+            this.getDetailsData(this.id);
+          }
+        },
+        immediate: true,
+      },
+    },
+    mounted() {},
+  
+    methods: {
+      handleClose() {
+        this.$emit("close", false);
+        this.item = {};
+      },
+  
+      openImg(src) {
+        window.open(src);
+      },
+  
+      getTrueTime(time) {
+        return this.$moment(time * 1000).format("YYYY-MM-DD hh:mm");
+      },
+  
+      getSxType(row) {
+        let arr = [];
+        let text = "";
+        for (let k in row) {
+          if (row[k] == "bad") {
+            arr.push(k);
+          }
+        }
+        this.satisfactionCategoryOptions.forEach((item) => {
+          arr.forEach((item1) => {
+            if (item1 == item.key) {
+              if (text == "") {
+                text = item.value;
+              } else {
+                text = text + "， " + item.value;
+              }
+            }
+          });
+        });
+        return text;
+      },
+      getSxReason(row) {
+        let text = "";
+        this.reason.forEach((item) => {
+          for (let key in row) {
+            if (item == key && row[key]) {
+              if (text == "") {
+                text = row[key];
+              } else {
+                text = text + "；" + row[key];
+              }
+            }
+          }
+        });
+        return text;
+      },
+      getMonthData(time) {
+        if (time) {
+          return this.$moment(time).format("YYYY年MM月");
+        }
+        return "";
+      },
+      getDetailsData(id) {
+        this.loading = true;
+        this.$http
+          .get(
+            "/governance/satisfaction/communitySelfInsp/inspResult/detail/" + id
+          )
+          .then((res) => {
+            this.loading = false;
+            const { code, data, msg } = res.data;
+            if (code === 0) {
+              this.item = { ...data.reporter, ...data.satisfaction };
+            } else {
+              this.$message.error(msg);
+            }
+          });
+        // this.$http
+        //   .post("/governance/provinceEvaluationRecord/" + id)
+        //   .then((res) => {
+        //     this.loading = false;
+        //     const { code, data, msg } = res.data;
+        //     if (code === 0) {
+        //       this.item = data;
+        //     } else {
+        //       this.$message.error(msg);
+        //     }
+        //   });
+        // this.$http
+        //   .get(
+        //     "/governance/satisfactionDetailList/getUnsatisfiedCategory?satisfactionSource="
+        //   )
+        //   .then(({ data: { data } }) => {
+        //     console.log('data::', data);
+        //     this.satisfactionCategoryOptions = data.map((item) => {
+        //       return {
+        //         label: item.categoryName,
+        //         value: item.categoryCode,
+        //       };
+        //     });
+        //   });
+      },
+    },
+  };
+  </script>
+  <style lang="scss" scoped>
+  @import "@/assets/scss/modules/shequzhili/event-info.scss";
+  .eventWrap {
+    width: 1094px;
+    // max-height: 798px;
+    overflow-y: auto;
+    overflow-x: hidden;
+    padding: 24px;
+    .eventDetails {
+      font-size: 18px;
+      margin: 48px 24px 48px 0;
+      img {
+        margin-top: -4px;
+        margin-right: 8px;
+      }
+    }
+  
+    .m-info {
+      padding: 0px !important;
+  
+      .m-process {
+        margin: 0 !important;
+        .detail {
+          .detail-field {
+            flex: none !important;
+          }
+        }
+      }
+    }
+  
+    .leftEvent {
+  
+      .eventItem {
+        font-size: 14px;
+        margin-bottom: 24px;
+      }
+    }
+  }
+  </style>
+  
\ No newline at end of file
diff --git a/src/views/modules/portrayal/house/cpts/details/xqdetail.vue b/src/views/modules/portrayal/house/cpts/details/xqdetail.vue
new file mode 100644
index 000000000..047666a2d
--- /dev/null
+++ b/src/views/modules/portrayal/house/cpts/details/xqdetail.vue
@@ -0,0 +1,188 @@
+<template>
+    <el-dialog
+      width="818px"
+      :modal="true"
+      :modal-append-to-body="false"
+      :destroy-on-close="true"
+      :visible="showDialog"
+      @close="handleClose"
+      title="需求详情"
+    >
+      <div class="eventWrap">
+        <el-row :gutter="32">
+          
+          <el-col
+            :span="23"
+            style="padding-left: 40px"
+          >
+            <div class="leftEvent">
+              <div class="eventItem">
+                <span>所属组织：</span>
+                <span>{{ item.gridName||'--' }}</span>
+              </div>
+              <div class="eventItem">
+                <span>上报渠道：</span>
+                <span>{{ item.reportTypeName||'--' }}</span>
+              </div>
+              <div class="eventItem">
+                <span>需求类型：</span>
+                <span>{{ item.categoryName ||'--'}}</span>
+              </div>
+              <div class="eventItem">
+                <span>上报时间：</span>
+                <span>{{ item.reportTime||'--' }}</span>
+              </div>
+              <div class="eventItem">
+                <div>需求描述：</div>
+                <div style="margin-top: 20px">{{ item.content ||'--'}}</div>
+              </div>
+              <div class="eventItem">
+                <span>需求人姓名：</span>
+                <span>{{ item.demandUserName ||'--'}}</span>
+              </div>
+              <div class="eventItem">
+                <span>需求人电话：</span>
+                <span> {{ $sensitive(item.demandUserMobile, 3, 7) }}</span>
+              </div>
+              <div class="eventItem">
+                <span>完成时限：</span>
+                <span>{{ item.wantServiceTime||'--' }}</span>
+              </div>
+              <div class="eventItem">
+                <span>需求人住址：</span>
+                <span>{{ item.serviceAddress||'--' }}</span>
+              </div>
+              <div class="eventItem">
+                <span>上报人：</span>
+                <span>{{ item.reportUserName||'--' }}</span>
+              </div>
+            </div>
+          </el-col>
+        </el-row>
+      </div>
+    </el-dialog>
+  </template>
+  
+  <script>
+  export default {
+    name: "ReportAnEvent",
+    components: {
+ 
+    },
+    props: {
+      id: {
+        type: String,
+        default: "",
+      },
+      showDialog: {
+        type: Boolean,
+        default: false,
+      },
+    },
+  
+    data() {
+      return {
+        item: {
+          logList: [],
+        },
+        loading: false,
+        loading1: false,
+        activities: [],
+      };
+    },
+  
+    computed: {},
+    watch: {
+      showDialog: {
+        handler(val) {
+          if (val) {
+            this.getDetailsData(this.id);
+          }
+        },
+        immediate: true,
+      },
+    },
+    mounted() {},
+  
+    methods: {
+      handleClose() {
+        this.$emit("close", false);
+        this.item = {};
+      },
+  
+      openImg(src) {
+        window.open(src);
+      },
+  
+      getTrueTime(time) {
+        return this.$moment(time * 1000).format("YYYY-MM-DD hh:mm");
+      },
+  
+      getDetailsData(id) {
+        this.loading = true;
+  
+        let params = {
+          demandRecId: id,
+        };
+        this.$http
+          .post("/governance/userdemand/demandDetail", params)
+          .then((res) => {
+            this.loading = false;
+            const { code, data, msg } = res.data;
+            if (code === 0) {
+              this.item = data;
+            } else {
+              this.$message.error(msg);
+            }
+          });
+      },
+    },
+  };
+  </script>
+  <style lang="scss" scoped>
+  @import "@/assets/scss/modules/shequzhili/event-info.scss";
+  .eventWrap {
+    width: 1094px;
+    height: 610px;
+    overflow-y: auto;
+    overflow-x: hidden;
+    padding: 24px;
+  
+    .eventDetails {
+      font-size: 18px;
+      margin: 48px 24px 48px 0;
+  
+      img {
+        margin-top: -4px;
+        margin-right: 8px;
+      }
+    }
+  
+    .m-info {
+      padding: 0px !important;
+  
+      .m-process {
+        margin: 0 !important;
+        .detail {
+          .detail-field {
+            flex: none !important;
+          }
+        }
+      }
+    }
+  
+    .leftEvent {
+      .eventItem {
+        font-size: 14px;
+        margin-bottom: 24px;
+  
+        span:first-child {
+        }
+  
+        span:last-child {
+        }
+      }
+    }
+  }
+  </style>
+  
\ No newline at end of file
diff --git a/src/views/modules/portrayal/house/cpts/graph.vue b/src/views/modules/portrayal/house/cpts/graph.vue
new file mode 100644
index 000000000..9fe382d51
--- /dev/null
+++ b/src/views/modules/portrayal/house/cpts/graph.vue
@@ -0,0 +1,205 @@
+
+<template>
+    <div>
+        <div style="height:300px; width: 500px;">
+            <RelationGraph ref="seeksRelationGraph" :options="graphOptions" :on-node-click="onNodeClick"
+                :on-line-click="onLineClick" />
+        </div>
+    </div>
+</template>
+  
+<script>
+import { requestPost } from '@/js/dai/request'
+
+export default {
+    name: 'RelationGraphDemo3',
+    components: {},
+    data() {
+        return {
+            graphOptions: {
+                disableDragNode: true,
+                defaultNodeBorderWidth: 0,
+                defaultNodeColor: 'rgba(238, 178, 94, 0)',
+                allowSwitchLineShape: true,
+                allowSwitchJunctionPoint: true,
+                defaultLineShape: 1,
+                allowShowMiniToolBar: false,
+                layouts: [
+                    {
+                        label: '中心',
+                        layoutName: 'center',
+                        layoutClassName: 'seeks-layout-center',
+                        distance_coefficient: 1.5
+                    }
+                ],
+                defaultJunctionPoint: 'border',
+                // 这里可以参考"Graph 图谱"中的参数进行设置
+            }
+        };
+    },
+    props: {
+        houseInfo: {
+            type: Object,
+            default: () => { }
+        }
+    },
+    mounted() {
+        this.$nextTick(() => {
+            this.getFamilyRelationshipList()
+        })
+    },
+    watch: {
+        houseInfo: {
+            handler(newVal, oldVal) {
+                this.getFamilyRelationshipList()
+            },
+            deep: true
+        }
+    },
+    methods: {
+        async getFamilyRelationshipList() {
+            let url = `/actual/base/peopleRoomOverview/getFamilyRelationshipListByHouseId?type=0&houseId=` + this.houseInfo.id;
+            let { code, data, msg } = await requestPost(url)
+            if (code == 0) {
+                if(!data)data = []
+                // 将房屋本身的信息放到数组元素的第一个
+                const rootNode = {};
+                rootNode["id"] = this.houseInfo.id;
+                rootNode["name"] = this.houseInfo.fullName;
+                rootNode["type"] = 1;
+                data.unshift(rootNode);
+
+                let familyList = data.map((item, index) => ({
+                    'id': `N${index + 1}`,
+                    'text': item.name,
+                    'innerHTML': `<div class="c-my-node${index == 0 ? '1' : '2'}  c-my-node-${item.type == 1?'home':item.gender==='1'?item.age>18&&item.age<60?'father':item.age<18?'son':'grandpa':item.gender === '2'?item.age>18&&item.age<60?'mother':item.age<18?'girl':'grandma':'father'}"><div class="c-node-name${index == 0 ? '1' : '2'}" style="color:#000">${item.name}${item.age?`（${item.age}）岁`:''}</div></div>`,
+                    'data':{id: item.id,type:item.type,name:item.name},
+
+                }))
+
+
+                let lineList = data.map((item, index) => ({
+                    'from': 'N1',
+                    'to': `N${index + 1}`,
+                    'text':item.resiHouseRel ===null?'未知':item.resiHouseRel ==='0'?'自住':item.resiHouseRel === '1'?'出租':'未知',
+                    'isHideArrow': true,
+                    'color': item.houseHolderRel === '父亲' ? '#3876f2' : (item.houseHolderRel === '母亲' || item.houseHolderRel === '祖父母' ? '#ff9696' : (item.houseHolderRel === '女儿' ? '#ffd5d5' : '#3876f2')),
+                    'fontColor': item.houseHolderRel === '父亲' ? '#3876f2' : (item.houseHolderRel === '母亲' || item.houseHolderRel === '祖父母' ? '#ff9696' : (item.houseHolderRel === '女儿' ? '#ffd5d5' : '#3876f2'))
+                }));
+                lineList = lineList.slice(1)
+                const __graph_json_data = { rootId: 'root', nodes: familyList, lines: lineList }
+                this.$emit('updataHouseIds',data.map(item=>item.id))
+                this.$refs.seeksRelationGraph.setJsonData(__graph_json_data, (graphInstance) => {
+                    // 这些写上当图谱初始化完成后需要执行的代码
+                });
+            } else {
+                this.$message.error(msg)
+            }
+        },
+
+        onNodeClick(nodeObject, $event) {
+            let {name,id,type} = nodeObject.data
+            if(type === 0){
+                this.$store.dispatch("saveData", {
+                    resiId:id,
+                    name
+                });
+                this.$router.push({ name: 'jumin-huaxiang' });
+                this.$store.state.contentTabs = this.$store.state.contentTabs.map(
+                    (item) => {
+                    if (item.name === "jumin-huaxiang") {
+                        return { ...item, title: name };
+                    }
+                    return item;
+                    }
+                );
+            }
+        },
+        onLineClick(lineObject, $event) {
+            console.log('onLineClick:', lineObject);
+        }
+    }
+};
+</script>
+  
+<style lang="scss" >
+.c-my-node2 {
+    border: none;
+    background-position: center center;
+    background-size: 100%;
+    height: 74px;
+    width: 74px;
+    border-radius: 40px;
+}
+
+.c-node-name2 {
+    margin-left: -5px;
+    text-align: center;
+    margin-top: 63px;
+    line-height: 20px;
+    position: absolute;
+    width: 96px;
+    height: auto;
+    background: #FFFFFF;
+    box-shadow: 0px 4px 6px 0px rgba(211, 213, 214, 0.4);
+    border-radius: 10px;
+}
+
+.c-my-node1 {
+    border: none;
+    background-size: 100%;
+    height: 100px;
+    width: 100px;
+    border-radius: 50px;
+    background-repeat: no-repeat;
+    background-position: center;
+}
+
+.c-my-node-son {
+    background-image: url(~@/assets/images/index/son.png) !important;
+}
+
+.c-my-node-girl {
+    background-image: url(~@/assets/images/index/girl.png) !important;
+}
+
+.c-my-node-father {
+    background-image: url(~@/assets/images/index/father.png) !important;
+}
+
+.c-my-node-mother {
+    background-image: url(~@/assets/images/index/mother.png) !important;
+}
+
+.c-my-node-grandpa {
+    background-image: url(~@/assets/images/index/grandpa.png) !important;
+}
+
+.c-my-node-grandma {
+    background-image: url(~@/assets/images/index/grandma.png) !important;
+}
+
+.c-my-node-home {
+    background-image: url(~@/assets/images/index/home.png) !important;
+}
+
+.c-node-name1 {
+    margin-left: -5px;
+    text-align: center;
+    margin-top: 63px;
+    // line-height: 20px;
+    position: absolute;
+    width: 96px;
+    height: auto;
+    background: #FFFFFF;
+    box-shadow: 0px 4px 6px 0px rgba(211, 213, 214, 0.4);
+    border-radius: 15px;
+    padding: 3px;
+    box-sizing: border-box;
+}
+
+.rel-node-checked {
+    box-shadow: none !important;
+}
+</style>
+  
\ No newline at end of file
diff --git a/src/views/modules/portrayal/house/cpts/table/changeRecord.vue b/src/views/modules/portrayal/house/cpts/table/changeRecord.vue
new file mode 100644
index 000000000..2f1b308d5
--- /dev/null
+++ b/src/views/modules/portrayal/house/cpts/table/changeRecord.vue
@@ -0,0 +1,56 @@
+<template>
+    <div class="table" style="padding:0 16px;">
+
+        <el-table class="m-table-item" :data="tableData" border style="width: 100%; margin-top:23px">
+            <el-table-column label="序号" type="index" fixed="left" align="left" width="50">
+            </el-table-column>
+            <el-table-column v-for="item in tableHeader" :key="item.columnName" :prop="item.columnName" :label="item.label"
+                align="left" :show-overflow-tooltip="true" :width="item.width || ''">
+                <template slot-scope="scope">
+                    <span>{{ handleFilterSpan(scope.row, item) }}</span>
+                </template>
+            </el-table-column>
+        </el-table>
+    </div>
+</template>
+  
+<script>
+export default {
+    components: {},
+    data() {
+        return {
+            tableHeader: [
+                { columnName: "resiName", label: "变更人", width: 150 },
+                { columnName: "typeName", label: "变更类型", width: 80 },
+                { columnName: "beforeChange", label: "变更前",  },
+                { columnName: "afterChange", label: "变更后",  },
+                { columnName: "operatorName", label: "操作人", width: 80 },
+                { columnName: "changeTime", label: "调整时间", width: 200 }
+            ],
+        };
+    },
+    activated() {
+    },
+    watch: {
+
+    },
+    computed: {
+    },
+    mounted() { },
+    props: {
+        tableData: {
+            type: Array,
+            default: []
+        }
+    },
+    methods: {
+        handleFilterSpan(row, item) {
+            let _val = "";
+            return _val || row[item.columnName];
+        },
+    },
+};
+</script>
+  
+<style scoped lang="scss"></style>
+  
\ No newline at end of file
diff --git a/src/views/modules/portrayal/house/cpts/table/complain.vue b/src/views/modules/portrayal/house/cpts/table/complain.vue
new file mode 100644
index 000000000..cc4b0a755
--- /dev/null
+++ b/src/views/modules/portrayal/house/cpts/table/complain.vue
@@ -0,0 +1,104 @@
+<template>
+    <div class="table">
+        <el-table :data="tableData"  >
+            <el-table-column label="序号" type="index" width="80" />
+            <el-table-column label="事件类型" prop="categorycode" width="" />
+            <el-table-column label="事件描述" prop="eventcontent" width="" />
+            <el-table-column label="办理状态" prop="status" width="" />
+            <el-table-column label="接收时间" prop="happentime" width="180" />
+            <el-table-column label="标记" prop="marktype" width="" />
+            <el-table-column label="操作" width="90" align="center">
+                <template slot-scope="data">
+                    <el-button type="text" @click="handleView(data.row)">查看</el-button>
+                </template>
+            </el-table-column>
+        </el-table>
+        <sjdetails :showDialog="showDialog" :id="rowId" @close="close" />
+    </div>
+</template>
+  
+<script>
+import sjdetails from "../details/sjdetail";
+export default {
+    name: "community",
+    components: {
+        sjdetails
+    },
+    data() {
+        return {
+            queryParams: {
+                residList: [],
+            },
+            list: [],
+            total: 0,
+            rowId: null,
+            showDialog: false,
+            pageNo: 1,
+            pageSize: 20
+        };
+    },
+    activated() {
+    },
+    watch: {
+
+    },
+    mounted() { },
+    props: {
+        tableData: {
+            type: Array,
+            default: []
+        }
+    },
+    methods: {
+        getList() {
+            let parm = {
+                residList: [this.resiId],
+                pageNo: this.pageNo,
+                pageSize: this.pageSize
+            }
+            this.list = [];
+            this.total = 0;
+            // this.$emit("changeTotal", { name: 2, total: 0 });
+            // 办理状态(-2：未知，-1：不接受回访，0：接受回访/待回访，1已回访)
+            const completeFlags = {
+                "-2": "未知",
+                "-1": "不接受回访",
+                0: "接受回访/待回访",
+                1: "已回访",
+            };
+            // 省满意度列表
+            this.$http.post("/actual/base/peopleRoomOverview/communitySatisfactionPageList", parm).then(({ data: res }) => {
+                this.list = []
+                //         this.list = res.data.list.map((item) => {
+                //     return {
+                //       ...item,
+                //       status: item.status ? statusArr[item.status] : null,
+                //       marktype: marktypes[item.marktype],
+                //     };
+                //   });
+                this.total = this.list.length;
+                this.$emit("changeTotal", { name: 2, total: this.total });
+            });
+        },
+        handleView(item) {
+            this.rowId = item.id;
+            this.showDialog = true;
+        },
+        close() {
+            this.showDialog = false;
+        },
+        handleSizeChange(val) {
+            this.pageSize = val;
+            this.pageNo = 1;
+            this.getList();
+        },
+        handleCurrentChange(val) {
+            this.pageNo = val;
+            this.getList();
+        },
+    },
+};
+</script>
+  
+<style scoped lang="scss"></style>
+  
\ No newline at end of file
diff --git a/src/views/modules/portrayal/house/cpts/table/fuwu.vue b/src/views/modules/portrayal/house/cpts/table/fuwu.vue
new file mode 100644
index 000000000..f076a2c91
--- /dev/null
+++ b/src/views/modules/portrayal/house/cpts/table/fuwu.vue
@@ -0,0 +1,63 @@
+<template>
+    <div class="table">
+        <el-table :data="tableData">
+            <el-table-column label="序号" type="index" width="80" />
+            <el-table-column label="需求类型" prop="serviceCategoryKey" width="" />
+            <el-table-column label="事件描述" prop="serviceName" width="" />
+            <el-table-column label="服务情况" prop="state" width="" />
+            <el-table-column label="创建时间" prop="serviceTimeStart" width="180" />
+            <el-table-column label="操作" width="90" align="center">
+                <template slot-scope="data">
+                    <el-button type="text" @click="handleView(data.row)">查看</el-button>
+                </template>
+            </el-table-column>
+        </el-table>
+        <fwdetail :showDialog="showDialog" :id="rowId" @close="close" />
+    </div>
+</template>
+  
+<script>
+import fwdetail from "../details/fwdetail";
+export default {
+    name: "community",
+    components: {
+        fwdetail
+    },
+    data() {
+        return {
+            queryParams: {
+                residList: [],
+            },
+            list: [],
+            total: 0,
+            rowId: null,
+            showDialog: false,
+        };
+    },
+    activated() {
+    },
+    watch: {
+
+    },
+    mounted() { },
+    props: {
+        tableData: {
+            type: Array,
+            default: []
+        }
+    },
+    methods: {
+
+        handleView(item) {
+            this.rowId = item.id;
+            this.showDialog = true;
+        },
+        close() {
+            this.showDialog = false;
+        },
+    },
+};
+</script>
+  
+<style scoped lang="scss"></style>
+  
\ No newline at end of file
diff --git a/src/views/modules/portrayal/house/cpts/table/sheng.vue b/src/views/modules/portrayal/house/cpts/table/sheng.vue
new file mode 100644
index 000000000..bfdb26447
--- /dev/null
+++ b/src/views/modules/portrayal/house/cpts/table/sheng.vue
@@ -0,0 +1,60 @@
+<template>
+    <div class="table">
+        <el-table :data="tableData">
+            <el-table-column label="序号" type="index" width="80" />
+            <el-table-column label="不满意事项类型" prop="scope" width="190" />
+            <el-table-column label="不满意事项描述" prop="problemDesc" width="" />
+            <el-table-column label="办理状态" prop="completeFlag" width="120" />
+            <el-table-column label="是否回访" prop="isReturn" width="120" />
+            <el-table-column label="操作" width="90" align="center">
+                <template slot-scope="data">
+                <el-button type="text" @click="handleView(data.row)">查看</el-button>
+                </template>
+            </el-table-column>
+        </el-table>
+        <shengdetail :showDialog="showDialog" :id="rowId" @close="close" />
+    </div>
+</template>
+  
+<script>
+import shengdetail from "../details/shengdetail";
+
+export default {
+    name: "community",
+    components: {
+        shengdetail
+    },
+    data() {
+        return {
+            
+            list: [],
+            total: 0,
+            rowId: null,
+            showDialog: false,
+        };
+    },
+    activated() {
+    },
+    watch: {
+    },
+    mounted() { },
+    props: {
+        tableData: {
+            type: Array,
+            default: []
+        }
+    },
+    methods: {
+        handleView(item) {
+            this.rowId = item.id;
+            this.showDialog = true;
+        },
+        close() {
+            this.showDialog = false;
+        },
+    },
+};
+</script>
+  
+<style scoped lang="scss"></style>
+  
\ No newline at end of file
diff --git a/src/views/modules/portrayal/house/cpts/table/shequ.vue b/src/views/modules/portrayal/house/cpts/table/shequ.vue
new file mode 100644
index 000000000..4aac5e61d
--- /dev/null
+++ b/src/views/modules/portrayal/house/cpts/table/shequ.vue
@@ -0,0 +1,59 @@
+<template>
+    <div class="table">
+        <el-table  :data="tableData">
+            <el-table-column label="序号" type="index" width="80" />
+            <el-table-column label="不满意事项类型" prop="scope" width="190" />
+            <el-table-column label="不满意事项描述" prop="problemDesc" width="" />
+            <el-table-column label="办理状态" prop="completeFlag" width="120" />
+            <el-table-column label="是否回访" prop="isReturn" width="120" />
+            <el-table-column label="操作" width="90" align="center">
+                <template slot-scope="data">
+                    <el-button type="text" @click="handleView(data.row)">查看</el-button>
+                </template>
+            </el-table-column>
+        </el-table>
+        <sqdetail :showDialog="showDialog" :id="rowId" @close="close" />
+    </div>
+</template>
+  
+<script>
+import sqdetail from "../details/sqdetail";
+export default {
+    name: "community",
+    components: {
+        sqdetail
+    },
+    data() {
+        return {
+            list: [],
+            total: 0,
+            rowId: null,
+            showDialog: false,
+        };
+    },
+    activated() {
+    },
+    watch: {
+        
+    },
+    mounted() { },
+    props: {
+        tableData: {
+            type: Array,
+            default: []
+        }
+    },
+    methods: {
+        handleView(item) {
+            this.rowId = item.id;
+            this.showDialog = true;
+        },
+        close() {
+            this.showDialog = false;
+        },
+    },
+};
+</script>
+  
+<style scoped lang="scss"></style>
+  
\ No newline at end of file
diff --git a/src/views/modules/portrayal/house/cpts/table/shijian.vue b/src/views/modules/portrayal/house/cpts/table/shijian.vue
new file mode 100644
index 000000000..92294cd37
--- /dev/null
+++ b/src/views/modules/portrayal/house/cpts/table/shijian.vue
@@ -0,0 +1,105 @@
+<template>
+    <div class="table">
+        <el-table  :data="tableData">
+            <el-table-column label="序号" type="index" width="80" />
+            <el-table-column label="事件类型" prop="categorycode" width="" />
+            <el-table-column label="事件描述" prop="eventcontent" width="" />
+            <el-table-column label="办理状态" prop="status" width="" />
+            <el-table-column label="接收时间" prop="happentime" width="180" />
+            <el-table-column label="操作" width="90" align="center">
+                <template slot-scope="data">
+                    <el-button type="text" @click="handleView(data.row)">查看</el-button>
+                </template>
+            </el-table-column>
+        </el-table>
+        <sjdetail :showDialog="showDialog" :id="rowId" @close="close" />
+
+    </div>
+</template>
+  
+<script>
+import sjdetail from "../details/sjdetail";
+export default {
+    components: {
+        sjdetail
+    },
+    data() {
+        return {
+            queryParams: {
+                residList: [],
+            },
+            list: [],
+            total: 0,
+            rowId: null,
+            showDialog: false,
+        };
+    },
+    activated() {
+    },
+    mounted() { },
+    props: {
+        resiId: {
+            type: String,
+            default: ''
+        },
+        tableData: {
+            type: Array,
+            default: []
+        }
+    },
+    methods: {
+        getList() {
+            let residList = [this.resiId]
+            this.list = [];
+            this.total = 0;
+            // this.$emit("changeTotal", { name: 2, total: 0 });
+            // 办理状态(-2：未知，-1：不接受回访，0：接受回访/待回访，1已回访)
+            const completeFlags = {
+                "-2": "未知",
+                "-1": "不接受回访",
+                0: "接受回访/待回访",
+                1: "已回访",
+            };
+            // 省满意度列表
+            this.$http.post("/actual/base/peopleRoomOverview/communitySatisfactionPageList", { residList }).then(({ data: res }) => {
+                this.list = [{
+                    scope: "服务态度",
+                    problemDesc: "服务人员态度不好",
+                    completeFlag: "未办理",
+                    isReturn: "否"
+                },
+                {
+                    scope: "处理速度",
+                    problemDesc: "等待时间过长",
+                    completeFlag: "已办理",
+                    isReturn: "是"
+                },
+                {
+                    scope: "设备问题",
+                    problemDesc: "使用的机器经常故障",
+                    completeFlag: "办理中",
+                    isReturn: "否"
+                },
+                {
+                    scope: "其他",
+                    problemDesc: "场地不够干净",
+                    completeFlag: "已办理",
+                    isReturn: "是"
+                }]
+                this.total = res.data.length;
+                //   this.$emit("changeTotal", { name: 2, total: this.total });
+            });
+        },
+        handleView(item) {
+            this.rowId = item.id;
+            this.showDialog = true;
+        },
+        close() {
+            this.showDialog = false;
+        },
+    },
+};
+</script>
+  
+<style scoped lang="scss"></style>
+  
\ No newline at end of file
diff --git a/src/views/modules/portrayal/house/cpts/table/xuqiu.vue b/src/views/modules/portrayal/house/cpts/table/xuqiu.vue
new file mode 100644
index 000000000..9b524c715
--- /dev/null
+++ b/src/views/modules/portrayal/house/cpts/table/xuqiu.vue
@@ -0,0 +1,103 @@
+<template>
+    <div class="table">
+        <el-table  :data="tableData">
+            <el-table-column label="序号" type="index" width="80" />
+            <el-table-column label="需求类型" prop="categoryName" width="" />
+            <el-table-column label="需求描述" prop="content" width="" />
+            <el-table-column label="办理情况" prop="status" width="" />
+            <el-table-column label="上报时间" prop="reportTime" width="180" />
+            <el-table-column label="操作" width="90" align="center">
+                <template slot-scope="data">
+                    <el-button type="text" @click="handleView(data.row)">查看</el-button>
+                </template>
+            </el-table-column>
+        </el-table>
+        <xqdetail :showDialog="showDialog" :id="rowId" @close="close" />
+    </div>
+</template>
+  
+<script>
+import xqdetail from "../details/xqdetail";
+
+export default {
+    name: "community",
+    components: {
+        xqdetail
+    },
+    data() {
+        return {
+            queryParams: {
+                residList: [],
+            },
+            list: [],
+            total: 0,
+            rowId: null,
+            showDialog: false,
+        };
+    },
+    activated() {
+    },
+
+    mounted() { },
+    props: {
+        tableData: {
+            type: Array,
+            default: []
+        }
+    },
+    methods: {
+        getList() {
+            let residList = [this.resiId]
+            this.list = [];
+            this.total = 0;
+            // this.$emit("changeTotal", { name: 2, total: 0 });
+            // 办理状态(-2：未知，-1：不接受回访，0：接受回访/待回访，1已回访)
+            const completeFlags = {
+                "-2": "未知",
+                "-1": "不接受回访",
+                0: "接受回访/待回访",
+                1: "已回访",
+            };
+            // 省满意度列表
+            this.$http.post("/actual/base/peopleRoomOverview/communitySatisfactionPageList", { residList }).then(({ data: res }) => {
+                this.list = [{
+                    scope: "服务态度",
+                    problemDesc: "服务人员态度不好",
+                    completeFlag: "未办理",
+                    isReturn: "否"
+                },
+                {
+                    scope: "处理速度",
+                    problemDesc: "等待时间过长",
+                    completeFlag: "已办理",
+                    isReturn: "是"
+                },
+                {
+                    scope: "设备问题",
+                    problemDesc: "使用的机器经常故障",
+                    completeFlag: "办理中",
+                    isReturn: "否"
+                },
+                {
+                    scope: "其他",
+                    problemDesc: "场地不够干净",
+                    completeFlag: "已办理",
+                    isReturn: "是"
+                }]
+                this.total = res.data.length;
+                //   this.$emit("changeTotal", { name: 2, total: this.total });
+            });
+        },
+        handleView(item) {
+            this.rowId = item.id;
+            this.showDialog = true;
+        },
+        close() {
+            this.showDialog = false;
+        },
+    },
+};
+</script>
+  
+<style scoped lang="scss"></style>
+  
\ No newline at end of file
diff --git a/src/views/modules/portrayal/house/index.vue b/src/views/modules/portrayal/house/index.vue
new file mode 100644
index 000000000..954ace650
--- /dev/null
+++ b/src/views/modules/portrayal/house/index.vue
@@ -0,0 +1,370 @@
+<template>
+  <div class="g-main" v-loading="loading">
+    <div class="right">
+      <!-- <div class="editBtn">
+        <el-button
+          class="diy-button--add"
+          type="primary"
+          size="small"
+          @click.native="handelClickHouseEdit"
+          >编辑</el-button
+        >
+      </div> -->
+      <div class="title-small" id="base">房屋信息</div>
+      <el-row type="flex" justify="" class="f-m-top23">
+
+        <el-col :span="6" class="f-flex">
+          <div class="f-label">房屋编码：</div>
+          <div class="f-left8 f-font-color" v-if="houseDetailObj">
+            {{houseDetailObj.houseCode || "--" }}
+          </div>
+        </el-col>
+        <el-col :span="6" class="f-flex">
+          <div class="f-label">房屋类型：</div>
+          <div class="f-left8 f-font-color" v-if="houseDetailObj">
+            {{houseDetailObj.houseTypeName || "--" }}
+          </div>
+        </el-col>
+        <el-col :span="6" class="f-flex">
+          <div class="f-label">房屋用途：</div>
+          <div class="f-left8 f-font-color" v-if="houseDetailObj">
+            {{houseDetailObj.purposeName || "--" }}
+          </div>
+        </el-col>
+        <el-col :span="6" class="f-flex">
+          <div class="f-label">房屋状态：</div>
+          <div class="f-left8 f-font-color" v-if="houseDetailObj">
+            {{houseDetailObj.rentName || "--" }}
+          </div>
+        </el-col>
+      </el-row>
+
+      <el-row type="flex" justify="" class="f-m-top23">
+
+        <el-col :span="6" class="f-flex">
+          <div class="f-label">家庭标签：</div>
+          <div class="f-left8 f-font-color" v-if="houseDetailObj.familyTags.length>0">
+            {{familyTags() }}
+          </div>
+          <div v-else>--</div>
+        </el-col>
+        <el-col :span="6" class="f-flex">
+          <div class="f-label">房主姓名：</div>
+          <div class="f-left8 f-font-color" v-if="houseDetailObj">
+            {{houseDetailObj.ownerName || "--" }}
+          </div>
+        </el-col>
+        
+        <el-col :span="6" class="f-flex">
+          <div class="f-label">证件号：</div>
+            <div class="f-left8 f-font-color">
+              {{
+                houseDetailObj.ownerIdCard
+                  ? houseDetailObj.ownerIdCard
+                  : "--"
+              }}
+            </div>
+            <img
+              v-show="showFlagIdCardBtn"
+              src="@/assets/img/yanjing1.png"
+              alt=""
+              width="14px"
+              style="margin-left: 10px"
+            />
+            <img
+              v-show="!showFlagIdCardBtn"
+              src="@/assets/img/yanjing2.png"
+              alt=""
+              width="14px"
+              style="margin-left: 10px"
+            />
+            <el-button
+              type="text"
+              class="div-table-button--blue"
+              size="small"
+              @click="handelCLickShowCheckPassword('idCard')"
+              >{{ showFlagIdCardBtn ? "显示" : "隐藏" }}</el-button
+            >
+        </el-col>
+        <el-col :span="6" class="f-flex">
+          <div class="f-label">联系电话：</div>
+          <div class="f-left8 f-font-color">
+            {{
+              houseDetailObj.ownerPhone
+                ? houseDetailObj.ownerPhone
+                : "--"
+            }}
+          </div>
+          <img
+            v-show="showFlagMobileBtn"
+            src="@/assets/img/yanjing1.png"
+            alt=""
+            width="14px"
+            style="margin-left: 10px"
+          />
+          <img
+            v-show="!showFlagMobileBtn"
+            src="@/assets/img/yanjing2.png"
+            alt=""
+            width="14px"
+            style="margin-left: 10px"
+          />
+          <el-button
+            type="text"
+            class="div-table-button--blue"
+            size="small"
+            @click="handelCLickShowCheckPassword('mobile')"
+            >{{ showFlagMobileBtn ? "显示" : "隐藏" }}</el-button
+          >
+        </el-col>
+      </el-row>
+
+      <el-row type="flex" justify="" class="f-m-top23">
+
+        <el-col :span="6" class="f-flex">
+          <div class="f-label">备注：</div>
+          <div class="f-left8 f-font-color" v-if="houseDetailObj">
+            {{houseDetailObj.remark || "--" }}
+          </div>
+        </el-col>
+        <el-col :span="6" class="f-flex">
+          <div class="f-label">创建时间：</div>
+          <div class="f-left8 f-font-color" v-if="houseDetailObj">
+            {{houseDetailObj.createdTime || "--" }}
+          </div>
+        </el-col>
+        <el-col :span="6" class="f-flex">
+          <div class="f-label">更新时间：</div>
+          <div class="f-left8 f-font-color" v-if="houseDetailObj">
+            {{houseDetailObj.updatedTime || "--" }}
+          </div>
+        </el-col>
+      </el-row>
+
+
+      <div class="title-small">关系图谱
+        <el-button type="primary" style="margin-left: 20px;" size="small"
+                            @click="addResident()">新增居民</el-button>
+      </div>
+      
+      <graph
+        :houseInfo="houseDetailObj"
+        @updataHouseIds="updataHouseIds"
+        v-if="houseDetailObj"
+      />
+      
+      <div class="title-small" id="businessRecord">业务记录</div>
+        <business-record :houseId="houseId" :familyResiList="houseIds" v-if="houseIds"></business-record>
+      <div class="title-small" id="updateRecord">更新记录</div>
+        <change-record :tableData="houseChangeRecordList"></change-record>
+    </div>
+    <el-dialog title="密码验证" :visible.sync="showCheckPassword">
+      <el-form :model="form" :rules="rules" ref="form">
+        <el-form-item label="密码" prop="password">
+          <el-input
+            v-model.trim="form.password"
+            autocomplete="off"
+            type="password"
+            placeholder="请输入当前账号密码"
+          ></el-input>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="showCheckPassword = false">取 消</el-button>
+        <el-button type="primary" @click="handelClickCheckPassword"
+          >确 定</el-button
+        >
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { requestPost } from "@/js/dai/request";
+import graph from "./cpts/graph.vue";
+import businessRecord from "./cpts/businessRecord.vue";
+import changeRecord from "./cpts/table/changeRecord.vue";
+
+export default {
+  data() {
+    return {
+      loading: true,
+      checkType: "edit", //edit或者view
+      houseChangeRecordList: [], //更新记录
+      houseDetailObj: {}, //房屋详情
+      showFlagIdCardBtn: true,
+      showFlagMobileBtn: true,
+
+      showCheckPassword: false,
+      houseId:"",
+      houseIds:[],
+      form: {
+        password: "", //脱敏确认密码
+      },
+      rules: {
+        password: [{ required: true, message: "请输入密码", trigger: "blur" }],
+      },
+      familyTagList:[]
+    };
+  },
+  components: { graph, businessRecord, changeRecord },
+  created() {
+    this.getFamilyTagsDict()
+  },
+  mounted() {},
+  activated() {},
+  methods: {
+    // 更新记录
+    async getChangeRecordDetailById() {
+      try {
+        const { data } = await this.$http.get(
+          `/actual/base/peopleRoomOverview/houseResidentChangeRecord?houseId=${this.houseId}`
+        );
+        if (data.data == null) {
+          this.houseChangeRecordList = [];
+        } else {
+          this.houseChangeRecordList = data.data;
+        }
+      } catch (error) {
+        console.log(error);
+      }
+    },
+    
+    getHouseDetail() {
+      this.$http
+        .post(`/actual/base/communityHouse/getMaskedHouseDeatilById/${this.houseId}`)
+        .then(async (res) => {
+          if (res.data.code === 0) {
+            this.houseDetailObj = res.data.data || {};
+            
+          } else if (res.data.code >= 8000) {
+            this.houseDetailObj = {};
+            this.$message.error(res.data.msg);
+          }
+        })
+        .catch((err) => {
+          console.log(err);
+        });
+      this.loading = false;
+    },
+    handelClickHouseEdit() {
+      this.checkType = "edit";
+      this.showCheckPassword = true;
+    },
+    updataHouseIds(val){
+      this.houseIds= val
+    },
+    handelCLickShowCheckPassword(type) {
+      this.form.password = "";
+      this.checkType = "view";
+      if (type === "idCard") {
+        if (this.showFlagIdCardBtn) {
+          this.showCheckPassword = true;
+        } else {
+          this.showFlagIdCardBtn = true;
+          this.$set(
+            this.houseDetailObj,
+            "ownerIdCard",
+            this.houseDetailObj.ownerIdCard.substr(0, 11) +
+              "****" +
+              this.houseDetailObj.ownerIdCard.substr(16, 2)
+          );
+        }
+      } else if (type === "mobile") {
+        if (this.showFlagMobileBtn) {
+          this.showCheckPassword = true;
+        } else {
+          this.showFlagMobileBtn = true;
+          this.$set(
+            this.houseDetailObj,
+            "ownerPhone",
+            this.houseDetailObj.ownerPhone.substr(0, 3) +
+              "****" +
+              this.houseDetailObj.ownerPhone.substr(7, 4)
+          );
+        }
+      }
+      this.tuominType = type;
+    },
+    
+    handelClickCheckPassword() {
+      this.$refs.form.validate((vali) => {
+        if (vali) {
+          this.handleSaveTuomin(this.form.password);
+        } else {
+          return false;
+        }
+      });
+    },
+
+    addResident(){
+      // this.$router.push({ name: 'add-resi' });
+      this.$router.push({
+            name: "add-resi",
+            params: { agencyId: "1673584241869238273",gridId: "1673585475279826946",villageId:"1673600667388780545",buildId:"1673600667527192577",unitId:"1673600667577524226",homeId:"1673600737530126338"},
+          });
+    },
+    
+    getFamilyTagsDict(){
+      this.$http.post("sys/dict/data/dictlist", {
+            dictType: 'family_tag',
+          }).then(res=>{
+           if(res.data.code === 0){
+              this.familyTagList = res.data.data;
+           }
+          }).catch(err=>{
+            console.log(err);
+          })
+    },
+    familyTags(){
+        const labels = this.houseDetailObj.familyTags.map(value => {
+          const item = this.familyTagList.find(obj => obj.value === value);
+          return item ? item.label : null;
+      });
+      return labels?labels.join('，'):'--';
+    },
+    async handleSaveTuomin(password) {
+      const url = `/actual/base/communityHouse/getClearHouseDeatilById/${this.houseId}`;
+      let parm = {
+        password,
+      };
+      const { data, code, msg } = await requestPost(url, parm);
+      if (code === 0) {
+        if (this.tuominType === "mobile") {
+            this.$set(this.houseDetailObj, "ownerPhone", data.ownerPhone);
+            this.showFlagMobileBtn = !this.showFlagMobileBtn;
+          }
+          if (this.tuominType === "idCard") {
+            this.$set(this.houseDetailObj, "ownerIdCard", data.ownerIdCard);
+            this.showFlagIdCardBtn = !this.showFlagIdCardBtn;
+          }
+          this.showCheckPassword = false;
+      } else {
+        this.$message.error(msg);
+      }
+    },
+  },
+  computed: {},
+  watch: {
+    "$store.state.huaXiang.houseInfo.houseId": {
+      handler(newValue, oldValue) {
+        this.houseId = newValue;
+        this.houseDetailObj = {};
+        this.houseGraphObj = {};
+
+        this.getHouseDetail();
+        this.getChangeRecordDetailById();
+        
+        this.loading = false;
+      },
+      deep: true, // 开启深度监听
+      immediate: true, // 立即触发一次handler
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+@import "@/assets/scss/pages/resiInfo.scss";
+@import "@/assets/scss/modules/management/list-main.scss";
+</style>
diff --git a/src/views/modules/portrayal/jumin/cpts/rightTop.vue b/src/views/modules/portrayal/jumin/cpts/businessRecord.vue
similarity index 63%
rename from src/views/modules/portrayal/jumin/cpts/rightTop.vue
rename to src/views/modules/portrayal/jumin/cpts/businessRecord.vue
index e068ac986..b8d190bbe 100644
--- a/src/views/modules/portrayal/jumin/cpts/rightTop.vue
+++ b/src/views/modules/portrayal/jumin/cpts/businessRecord.vue
@@ -1,100 +1,20 @@
 <template>
-  <div class="">
-    <el-tabs v-model="topTabs" @tab-click="tabClick">
+  <div style="padding:0 16px;margin-top: 7px;">
+    <el-tabs v-model.trim="topTabs" @tab-click="tabClick">
       <el-tab-pane :label="complainLabel" name="12345">
         <complain :tableData="complainList" :key="resiId[0]" />
-        <el-row type="flex">
-          <el-col :span="12" align="left">
-            <div style="margin-top: 25px">共{{ complainTotal }}条</div>
-          </el-col>
-          <el-col :span="12" align="right">
-            <el-pagination
-              @size-change="handleSizeChange"
-              @current-change="handleCurrentChange"
-              :current-page.sync="pageNo"
-              :page-size="pageSize"
-              layout="prev, pager, next, jumper"
-              :total="complainTotal"
-            >
-            </el-pagination
-          ></el-col>
-        </el-row>
       </el-tab-pane>
       <el-tab-pane :label="shengLabel" name="sheng">
         <sheng :tableData="shengList" :key="resiId[0]" />
-        <el-row type="flex">
-          <el-col :span="12" align="left">
-            <div style="margin-top: 25px">共{{ shengTotal }}条</div>
-          </el-col>
-          <el-col :span="12" align="right">
-            <el-pagination
-              @size-change="handleSizeChange"
-              @current-change="handleCurrentChange"
-              :current-page.sync="pageNo"
-              :page-size="pageSize"
-              layout="prev, pager, next,jumper"
-              :total="shengTotal"
-            >
-            </el-pagination
-          ></el-col>
-        </el-row>
       </el-tab-pane>
       <el-tab-pane :label="shequLabel" name="shequ">
         <shequ :tableData="shequList" :key="resiId[0]" />
-        <el-row type="flex">
-          <el-col :span="12" align="left">
-            <div style="margin-top: 25px">共{{ shequTotal }}条</div>
-          </el-col>
-          <el-col :span="12" align="right">
-            <el-pagination
-              @size-change="handleSizeChange"
-              @current-change="handleCurrentChange"
-              :current-page.sync="pageNo"
-              :page-size="pageSize"
-              layout="prev, pager, next, jumper"
-              :total="shequTotal"
-            >
-            </el-pagination
-          ></el-col>
-        </el-row>
       </el-tab-pane>
       <el-tab-pane :label="shijianLabel" name="shijian">
         <shijian :tableData="shijianList" :key="resiId[0]" />
-        <el-row type="flex">
-          <el-col :span="12" align="left">
-            <div style="margin-top: 25px">共{{ shijianTotal }}条</div>
-          </el-col>
-          <el-col :span="12" align="right">
-            <el-pagination
-              @size-change="handleSizeChange"
-              @current-change="handleCurrentChange"
-              :current-page.sync="pageNo"
-              :page-size="pageSize"
-              layout="prev, pager, next, jumper"
-              :total="shijianTotal"
-            >
-            </el-pagination
-          ></el-col>
-        </el-row>
       </el-tab-pane>
       <el-tab-pane :label="xuqiuLabel" name="xuqiu">
         <xuqiu :tableData="xuqiuList" :key="resiId[0]" />
-        <el-row type="flex">
-          <el-col :span="12" align="left">
-            <div style="margin-top: 25px">共{{ xuqiuTotal }}条</div>
-          </el-col>
-          <el-col :span="12" align="right">
-            <el-pagination
-              @size-change="handleSizeChange"
-              @current-change="handleCurrentChange"
-              :current-page.sync="pageNo"
-              :page-size="pageSize"
-              layout="prev, pager, next, jumper"
-              :total="xuqiuTotal"
-            >
-            </el-pagination
-          ></el-col>
-        </el-row>
       </el-tab-pane>
       <el-tab-pane :label="fuwuLabel" name="fuwu">
         <div style="display: flex; flex-direction: column; height: 100%">
@@ -103,22 +23,6 @@
             :key="resiId[0]"
             style="flex: 1; overflow: auto"
           />
-          <el-row type="flex">
-            <el-col :span="12" align="left">
-              <div style="margin-top: 25px">共{{ fuwuTotal }}条</div>
-            </el-col>
-            <el-col :span="12" align="right">
-              <el-pagination
-                @size-change="handleSizeChange"
-                @current-change="handleCurrentChange"
-                :current-page.sync="pageNo"
-                :page-size="pageSize"
-                layout="prev, pager, next, jumper"
-                :total="fuwuTotal"
-              >
-              </el-pagination>
-            </el-col>
-          </el-row>
         </div>
       </el-tab-pane>
     </el-tabs>
@@ -163,25 +67,13 @@ export default {
       fuwuTotal: 0,
 
       pageNo: 1,
-      pageSize:window.localStorage.getItem('pageSize') || 20,
+      pageSize: 20,
     };
   },
   //创建前
   created() {
-    if (this.type == "0") {
-      this.resiId = [this.userInfo.resiId];
-    } else if (this.type == "1") {
-      this.resiId = this.familyResiList;
-    }
-  },
-  async mounted() {
-    await this.getComplainList();
-    await this.getShengList();
-    await this.getShequList();
-    await this.getshijianList();
-    await this.getxuqiuList();
-    await this.getfuwuList();
   },
+   mounted() {},
   props: {
     userInfo: {
       type: Object,
@@ -191,10 +83,7 @@ export default {
       type: Array,
       default: () => [],
     },
-    type: {
-      type: String,
-      default: "0",
-    },
+   
   },
   //方法
   methods: {
@@ -219,7 +108,6 @@ export default {
       };
       const marktypes = ["普通事件", "难点读点", "矛盾纠纷", "自身问题"];
 
-      // 省满意度列表
       this.$http
         .post("/actual/base/peopleRoomOverview/eventPageList", parm)
         .then(({ data: res }) => {
@@ -374,7 +262,20 @@ export default {
   //计算
   computed: {},
   //监听
-  watch: {},
+  watch: {
+    'userInfo': {
+      handler(newVal, oldVal) {
+        this.resiId = [this.userInfo.baseInfoDto.resiId];
+        this.getComplainList();
+        this.getShengList();
+        this.getShequList()
+        this.getfuwuList();
+        this.getshijianList();
+        this.getxuqiuList();
+      },
+      deep: true
+    }
+  },
 };
 </script>
 
diff --git a/src/views/modules/portrayal/jumin/cpts/details/eventdetail.vue b/src/views/modules/portrayal/jumin/cpts/details/eventdetail.vue
new file mode 100644
index 000000000..d27cc6128
--- /dev/null
+++ b/src/views/modules/portrayal/jumin/cpts/details/eventdetail.vue
@@ -0,0 +1,306 @@
+<template>
+  <el-dialog width="1118px" :modal="true" :modal-append-to-body="false" :destroy-on-close="true" :visible="showDialog"
+    @close="handleClose" title="事件详情">
+    <div class="eventWrap">
+      <el-row :gutter="32">
+        <el-col :span="13" style="padding-left: 40px">
+          <div class="leftEvent">
+
+            <div class="eventItem">
+              <span>所属组织：</span>
+              <span>{{ item.gridName || '--' }}</span>
+            </div>
+            <div class="eventItem">
+              <span>上报渠道：</span>
+              <span>{{ item.sourceTypeName || '--' }}</span>
+            </div>
+            <div class="eventItem">
+              <span>事件类型：</span>
+              <span>{{ item.categoryName || '--' }}</span>
+            </div>
+            <div class="eventItem">
+              <span>接受时间：</span>
+              <span>{{ item.happenTime || '--' }}</span>
+            </div>
+            <!--            <div class="eventItem">
+                            <span>工单号：</span>
+                            <span>{{ item.workOrderNum }}</span>
+                          </div>-->
+            <div class="eventItem">
+              <div>问题描述：</div>
+              <div style="margin-top: 20px">{{ item.eventContent || '--' }}</div>
+            </div>
+            <!--            <div class="eventItem">
+                            <div>图片：</div>
+                            <div style="margin-top: 20px; display: flex">
+                              <img
+                                style="width: 100px; height: 100px; margin-right: 5px"
+                                v-for="src in item.imageList"
+                                :key="src"
+                                :src="src"
+                                alt="/"
+                                @click="openImg(src)"
+                              />
+                            </div>
+                          </div>-->
+            <div class="eventItem">
+              <span>联系人：</span>
+              <span>{{ item.name || '--' }}</span>
+            </div>
+            <div class="eventItem">
+              <span>联系电话：</span>
+              <span>{{ item.mobile || '--' }}</span>
+            </div>
+            <div class="eventItem">
+              <span>详细地址：</span>
+              <span>{{ item.address || '--' }}</span>
+            </div>
+            <div class="eventItem">
+              <span>办结时限：</span>
+              <span>{{ item.latestOperatedTime || '--' }}</span>
+            </div>
+            <div class="eventItem">
+              <span>满意度评价：</span>
+              <span>{{ item.satisfactionName || '--' }}</span>
+            </div>
+          </div>
+        </el-col>
+        <el-col :span="11">
+          <div class="rightEvent m-info">
+            <!-- <div class="eventDetails">
+              <img :width="18" :height="18" src="@/assets/images/manyidu/tc-title-icon.png" />办理进展
+            </div> -->
+            <!-- <el-timeline class="timeline" :reverse="true">
+                  <el-timeline-item v-for="(item, index) in activities" :key="index" :class="index == activities.length - 1 ? 'sucess' : ''">
+                    <div class="status-box">
+                      <div class="status1" v-if="index == activities.length - 1">回复</div>
+                      <div class="status2" v-else>完成并回复</div>
+                      <div class="timestamp">{{ item.timeLimit ? $moment(item.timeLimit).format("YYYY-MM-DD hh:mm:ss") : "" }}</div>
+                    </div>
+                    <div class="content">
+                      <div class="field">回复人：</div>
+                      <div class="value">{{ item.departmentName }}</div>
+                    </div>
+                    <div class="content">
+                      <div class="field">回复内容：</div>
+                      <div class="value">{{ item.publicReply }}</div>
+                    </div>
+                  </el-timeline-item>
+                </el-timeline> -->
+            <div v-if="activities.length > 0">
+              <!-- <el-card :class="{ 'box-card': source === 'visiual' }" style="min-height: calc(88vh - 50px); overflow: auto"> -->
+              <div class="m-process">
+                <div class="list">
+                  <div class="item" :class="[index === 0 ? 'z-on' : '']" :key="item.processId"
+                    v-for="(item, index) in activities">
+                    <div class="item-row">
+                      <template v-if="item.agencyId">
+                        <div class="name">指派</div>
+                      </template>
+                      <template v-if="!item.timeLimit">
+                        <div class="name">完成并回复</div>
+                      </template>
+                      <template v-if="!item.agencyId && item.timeLimit">
+                        <div class="name">{{ item.processName || '--' }}</div>
+                      </template>
+                      <div class="date">
+                        {{
+                          item.processTime ? getTrueTime(item.processTime) : ""
+                        }}
+                      </div>
+                    </div>
+                    <div v-if="item.type === 'event'">
+                      <template v-if="item.agencyId">
+                        <div class="detail">
+                          <div class="detail-field">指派人：</div>
+                          <div class="detail-value">
+                            {{ item.departmentName || '--' }}
+                          </div>
+                        </div>
+                        <div class="detail">
+                          <div class="detail-field">指派部门：</div>
+                          <div class="detail-value">
+                            {{ item.agencyName || '--' }}
+                          </div>
+                        </div>
+                        <div class="detail">
+                          <div class="detail-field">转办意见：</div>
+                          <div class="detail-value">
+                            {{ item.publicReply || '--' }}
+                          </div>
+                        </div>
+                        <div class="detail">
+                          <div class="detail-field">办结时限：</div>
+                          <div class="detail-value">
+                            {{ item.timeLimit || '--' }}
+                          </div>
+                        </div>
+                      </template>
+                      <template v-else>
+                        <div class="detail">
+                          <div class="detail-field">回复人：</div>
+                          <div class="detail-value">
+                            {{ item.departmentName || '--' }}
+                          </div>
+                        </div>
+                        <div class="detail">
+                          <div class="detail-field">回复内容：</div>
+                          <div class="detail-value">
+                            {{ item.publicReply || '--' }}
+                          </div>
+                        </div>
+                        <div class="detail" v-if="item.timeLimit">
+                          <div class="detail-field">办结时限：</div>
+                          <div class="detail-value">
+                            {{ getTrueTime(item.timeLimit) }}
+                          </div>
+                        </div>
+                      </template>
+                    </div>
+                  </div>
+                </div>
+              </div>
+              <!-- </el-card> -->
+            </div>
+          </div>
+        </el-col>
+      </el-row>
+    </div>
+  </el-dialog>
+</template>
+  
+<script>
+export default {
+  name: "ReportAnEvent",
+  components: {
+  },
+  props: {
+    id: {
+      type: String,
+      default: "",
+    },
+    showDialog: {
+      type: Boolean,
+      default: false,
+    },
+  },
+
+  data() {
+    return {
+      item: {},
+      loading: false,
+      loading1: false,
+      activities: [],
+    };
+  },
+
+  computed: {},
+  watch: {
+    showDialog: {
+      handler(val) {
+        if (val) {
+          this.getDetailsData(this.id);
+          this.getProcessData(this.id);
+        } else {
+          this.item = {}
+          this.activities = []
+        }
+      },
+      immediate: true,
+    },
+  },
+  mounted() {
+  },
+
+  methods: {
+    handleClose() {
+      this.$emit("close", false);
+      this.item = {};
+    },
+
+    openImg(src) {
+      window.open(src);
+    },
+
+    getTrueTime(time) {
+      return this.$moment(time * 1000).format("YYYY-MM-DD hh:mm");
+    },
+
+    getDetailsData(id) {
+      this.loading = true;
+      this.$http
+        .post("/governance/icEventOld/detail", { icEventId: id })
+        .then((res) => {
+          const { code, data, msg } = res.data;
+          if (code === 0) {
+            this.item = data;
+            this.loading = false;
+          } else {
+            this.loading = false;
+            this.$message.error(msg);
+          }
+        });
+    },
+
+    getProcessData(id) {
+      this.$http
+        .post("/governance/icEventOld/process", { icEventId: id })
+        .then((res) => {
+          const { code, data, msg } = res.data;
+          if (code === 0) {
+            this.activities = data;
+            this.loading1 = false;
+          } else {
+            this.loading1 = false;
+            this.$message.error(msg);
+          }
+        });
+    },
+  },
+};
+</script>
+  
+<style lang="scss" scoped>
+@import "@/assets/scss/modules/shequzhili/event-info.scss";
+
+.eventWrap {
+  width: 1094px;
+  overflow-y: auto;
+  overflow-x: hidden;
+  padding: 24px;
+
+  .eventDetails {
+    font-size: 18px;
+    margin: 48px 24px 48px 0;
+
+    img {
+      margin-top: -4px;
+      margin-right: 8px;
+    }
+  }
+
+  .m-info {
+    padding: 0px !important;
+
+    .m-process {
+      margin: 0 !important;
+
+      .detail {
+        .detail-field {
+          flex: none !important;
+        }
+      }
+    }
+  }
+
+  .leftEvent {
+    .eventItem {
+      font-size: 14px;
+      margin-bottom: 24px;
+
+      span:first-child {}
+    }
+  }
+}
+</style>
+  
\ No newline at end of file
diff --git a/src/views/modules/portrayal/jumin/cpts/graph.vue b/src/views/modules/portrayal/jumin/cpts/graph.vue
new file mode 100644
index 000000000..4e62c0662
--- /dev/null
+++ b/src/views/modules/portrayal/jumin/cpts/graph.vue
@@ -0,0 +1,206 @@
+
+<template>
+    <div>
+        <div style="height:300px; width: 500px;">
+            <RelationGraph ref="seeksRelationGraph" :options="graphOptions" :on-node-click="onNodeClick"
+                :on-line-click="onLineClick" />
+        </div>
+    </div>
+</template>
+  
+<script>
+import { requestPost } from '@/js/dai/request'
+
+export default {
+    name: 'RelationGraphDemo3',
+    components: {},
+    data() {
+        return {
+            graphOptions: {
+                disableDragNode: true,
+                defaultNodeBorderWidth: 0,
+                defaultNodeColor: 'rgba(238, 178, 94, 0)',
+                allowSwitchLineShape: true,
+                allowSwitchJunctionPoint: true,
+                defaultLineShape: 1,
+                allowShowMiniToolBar: false,
+                layouts: [
+                    {
+                        label: '中心',
+                        layoutName: 'center',
+                        layoutClassName: 'seeks-layout-center',
+                        distance_coefficient: 1.5
+                    }
+                ],
+                defaultJunctionPoint: 'border',
+                // 这里可以参考"Graph 图谱"中的参数进行设置
+            }
+        };
+    },
+    props: {
+        userInfo: {
+            type: Object,
+            default: () => { }
+        }
+    },
+    mounted() {
+        this.$nextTick(() => {
+            this.getFamilyRelationshipList()
+        })
+    },
+    watch: {
+        userInfo: {
+            handler(newVal, oldVal) {
+                this.getFamilyRelationshipList()
+            },
+            deep: true
+        }
+    },
+    methods: {
+        async getFamilyRelationshipList() {
+            let url = `/actual/base/peopleRoomOverview/getFamilyRelationshipList?type=0&resid=` + this.userInfo.resiId;
+            let { code, data, msg } = await requestPost(url)
+            if (code == 0) {
+                let index = data.findIndex(item => item.id == this.userInfo.resiId);
+                if (index !== -1) {
+                    const [item] = data.splice(index, 1);
+                    data.unshift(item);
+                }
+                let familyList = data.map((item, index) => ({
+                    'id': `N${index + 1}`,
+                    'text': item.name,
+                    'innerHTML': `<div class="c-my-node${index == 0 ? '1' : '2'}  c-my-node-${item.type == 1?'home':item.gender==='1'?item.age>18&&item.age<60?'father':item.age<=18?'son':'grandpa':item.gender === '2'?item.age>18&&item.age<=60?'mother':item.age<=18?'girl':'grandma':'father'}"><div class="c-node-name${index == 0 ? '1' : '2'}" style="color:#000">${item.name}${item.age?`（${item.age}）岁`:''}</div></div>`,
+                    'data':{id: item.id,type:item.type,name:item.name},
+                }))
+                let lineList = data.map((item, index) => ({
+                    'from': 'N1',
+                    'to': `N${index + 1}`,
+                    'text':item.type ==1?'房屋':data[index].houseHolderRel || '未知',
+                    'isHideArrow': true,
+                    'color': item.houseHolderRel === '父亲' ? '#3876f2' : (item.houseHolderRel === '母亲' || item.houseHolderRel === '祖父母' ? '#ff9696' : (item.houseHolderRel === '女儿' ? '#ffd5d5' : '#3876f2')),
+                    'fontColor': item.houseHolderRel === '父亲' ? '#3876f2' : (item.houseHolderRel === '母亲' || item.houseHolderRel === '祖父母' ? '#ff9696' : (item.houseHolderRel === '女儿' ? '#ffd5d5' : '#3876f2')),
+                    
+                }));
+                lineList = lineList.slice(1)
+                const __graph_json_data = { rootId: 'root', nodes: familyList, lines: lineList }
+                this.$refs.seeksRelationGraph.setJsonData(__graph_json_data, (graphInstance) => {
+                    // 这些写上当图谱初始化完成后需要执行的代码
+                });
+                this.familyList = data
+            } else {
+                this.$message.error(msg)
+            }
+        },
+
+        onNodeClick(nodeObject, $event) {
+            let {name,id,type} = nodeObject.data
+            if(type === 0){
+                this.$store.dispatch("saveData", {
+                    resiId:id,
+                    name
+                });
+                this.$store.state.contentTabs = this.$store.state.contentTabs.map(
+                    (item) => {
+                    if (item.name === "jumin-huaxiang") {
+                        return { ...item, title: name };
+                    }
+                    return item;
+                    }
+                );
+            }else if(type === 1){
+                this.$store.dispatch('saveDataH', { houseId:id, houseName:name});
+                this.$router.push({ name: 'house-huaxiang' });
+                this.$store.state.contentTabs = this.$store.state.contentTabs.map(item => {
+                    if (item.name === "house-huaxiang") {
+                        return { ...item, title: name };
+                    }
+                    return item;
+                });
+            }
+        },
+        onLineClick(lineObject, $event) {
+            console.log('onLineClick:', lineObject);
+        }
+    }
+};
+</script>
+  
+<style lang="scss" >
+.c-my-node2 {
+    border: none;
+    background-position: center center;
+    background-size: 100%;
+    height: 74px;
+    width: 74px;
+    border-radius: 40px;
+}
+
+.c-node-name2 {
+    margin-left: 2px;
+    text-align: center;
+    margin-top: 83px;
+    // line-height: 20px;
+    position: absolute;
+    width: 96px;
+    height: auto;
+    background: #FFFFFF;
+    box-shadow: 0px 4px 6px 0px rgba(211, 213, 214, 0.4);
+    border-radius: 10px;
+}
+
+.c-my-node1 {
+    border: none;
+    background-size: 100%;
+    height: 100px;
+    width: 100px;
+    border-radius: 50px;
+    background-repeat: no-repeat;
+    background-position: center;
+}
+
+.c-my-node-son {
+    background-image: url(~@/assets/images/index/son.png) !important;
+}
+
+.c-my-node-girl {
+    background-image: url(~@/assets/images/index/girl.png) !important;
+}
+
+.c-my-node-father {
+    background-image: url(~@/assets/images/index/father.png) !important;
+}
+
+.c-my-node-mother {
+    background-image: url(~@/assets/images/index/mother.png) !important;
+}
+
+.c-my-node-grandpa {
+    background-image: url(~@/assets/images/index/grandpa.png) !important;
+}
+
+.c-my-node-grandma {
+    background-image: url(~@/assets/images/index/grandma.png) !important;
+}
+
+.c-my-node-home {
+    background-image: url(~@/assets/images/index/home.png) !important;
+}
+
+.c-node-name1 {
+    margin-left: 1px;
+    text-align: center;
+    margin-top: 72px;
+    // line-height: 20px;
+    position: absolute;
+    width: 96px;
+    height: auto;
+    background: #FFFFFF;
+    box-shadow: 0px 4px 6px 0px rgba(211, 213, 214, 0.4);
+    border-radius: 10px;
+}
+
+.rel-node-checked {
+    box-shadow: none !important;
+}
+</style>
+  
\ No newline at end of file
diff --git a/src/views/modules/portrayal/jumin/cpts/pointsRecord.vue b/src/views/modules/portrayal/jumin/cpts/pointsRecord.vue
deleted file mode 100644
index 72db14b07..000000000
--- a/src/views/modules/portrayal/jumin/cpts/pointsRecord.vue
+++ /dev/null
@@ -1,104 +0,0 @@
-<template>
-    <div class="enjoy-service">
-        <div class="enjoy-service-item" v-for="(item, index) in data">
-            <div class="num">+{{ item.classificationNum }}</div>
-            <div class="info">
-                <div class="title">{{ item.classification }}</div>
-                <div class="time">{{ item.recordTime }}</div>
-            </div>
-        </div>
-    </div>
-</template>
-
-<script>
-export default {
-    //数据
-    data() {
-        return {
-            data: [],
-        };
-    },
-    //创建前
-    created() {
-        this.getData();
-    },
-    props: {
-        resiId: {
-            type: String,
-            default: ''
-        }
-    },
-    //方法
-    methods: {
-        getData() {
-            this.data = [];
-            this.$http
-                .get("/actual/base/peopleRoomOverview/recorHistory")
-                .then(({ data: res }) => {
-                    if (res.code == 0) {
-                        this.data = res.data;
-                    }
-                });
-        },
-    },
-    //子组件注册
-    components: {},
-    //计算
-    computed: {},
-    //监听
-    watch: {},
-}
-</script>
-<style lang="scss" scoped>
-.enjoy-service {
-    padding-left: 26px;
-    margin-top: 12px;
-    height: 100%;
-    overflow-y: scroll;
-}
-
-.enjoy-service-item {
-    color: #333333;
-    display: flex;
-    padding: 14px 16px 14px;
-    margin-bottom: 8px;
-    background: #fff;
-
-    &:hover {
-        background: #f5f7fa !important;
-        color: #0056D6 !important;
-
-        *,
-        *::before,
-        *::after {
-            // 这将会选择所有子元素和伪元素
-            color: #0056D6 !important;
-        }
-    }
-
-    .num {
-        font-size: 24px;
-        font-weight: 500;
-        line-height: 22px;
-        color: #000000;
-        display: flex;
-        align-items: center;
-    }
-
-    .info {
-        font-size: 14px;
-        margin-left: 40px;
-
-        .title {
-            font-weight: 500;
-            margin-bottom: 10px;
-        }
-
-        .time {
-            font-weight: 400;
-            color: #000000;
-            opacity: 0.65;
-        }
-    }
-}
-</style>
diff --git a/src/views/modules/portrayal/jumin/cpts/staffTag.vue b/src/views/modules/portrayal/jumin/cpts/staffTag.vue
new file mode 100644
index 000000000..f8bba504c
--- /dev/null
+++ b/src/views/modules/portrayal/jumin/cpts/staffTag.vue
@@ -0,0 +1,262 @@
+<template>
+    <div style="padding-left: 16px;margin-top: 24px;">
+        <el-form ref="formRef" :model="formData">
+            <el-table border ref="tableBox" :data="formData.tableData" :row-style="{ height: '50px' }"
+                :cell-style="{ padding: '0px' }">
+                <el-table-column prop="province" label="标签" width="120" align="center">
+                </el-table-column>
+                <el-table-column prop="city" label="内容" min-width="70" align="left">
+                    <template slot-scope="scope">
+                        <el-form-item v-if="scope.row.type == 'radio'">
+                            <el-radio-group v-model.trim="scope.row.value" v-for="(item, index) in scope.row.option"
+                                :key="index" @change="handeleClickRadio(item.value)">
+                                <el-radio :label="item.value" :disabled="formType == 'detail'"><span
+                                        style="margin-right: 50px;">{{ item.label
+                                        }}</span></el-radio>
+                            </el-radio-group>
+                        </el-form-item>
+                        <el-form-item :prop="'tableData.' + scope.$index + '.value'"
+                            v-if="scope.row.type == 'checkbox'">
+                            <el-checkbox-group v-model.trim="scope.row.value">
+                                <el-checkbox @change="handeleClickchckbox(item, $event, scope.$index)"
+                                    :disabled="formType == 'detail'" v-for="(item, index) in scope.row.option"
+                                    :key="index" :label="item.value">{{ item.label
+                                    }}</el-checkbox>
+                            </el-checkbox-group>
+                        </el-form-item>
+                    </template>
+                </el-table-column>
+
+            </el-table>
+        </el-form>
+    </div>
+</template>
+
+<script>
+export default {
+    data() {
+        return {
+            formData: {
+                name: '',
+                age: '',
+                tableData: [
+                    {
+                        index: 0,
+                        province: '政治面貌',
+                        value: 0,
+                        type: 'radio',
+                        option: [
+                            { label: '群众', value: 0 },
+                            { label: '党员', value: 1 },
+                            { label: '共青团员', value: 2 },
+                        ]
+                    },
+                    {
+                        index: 1,
+                        province: '健康状态',
+                        value: [],
+                        type: 'checkbox',
+                        option: [
+                            {
+                                label: '残疾',
+                                value: 'disabilityFlag'
+                            },
+                            {
+                                label: '大病',
+                                value: 'seriousIllnessFlag'
+                            },
+                            {
+                                label: '慢病',
+                                value: 'chronicDiseaseFlag'
+                            },
+                            {
+                                label: '死亡',
+                                value: 'deathFlag'
+                            }
+                        ]
+                    },
+                    {
+                        index: 2,
+                        province: '关注人群',
+                        value: [],
+                        type: 'checkbox',
+                        option: [
+                            {
+                                label: '老年人',
+                                value: 'oldPeopleFlag'
+                            },
+                            {
+                                label: '低保',
+                                value: 'subsistenceAllowanceFlag'
+                            },
+                            {
+                                label: '退役军人',
+                                value: 'veteranFlag'
+                            },
+                            {
+                                label: '保障房人员',
+                                value: 'ensureHouseFlag'
+                            },
+                            {
+                                label: '育龄妇女',
+                                value: 'fertileWomanFlag'
+                            },
+                            {
+                                label: '特扶人员',
+                                value: 'specialSupportFlag'
+                            }
+                        ]
+                    },
+                    {
+                        index: 3,
+                        province: '特殊人群',
+                        value: [],
+                        type: 'checkbox',
+                        option: []
+                    },
+                    {
+                        index: 4,
+                        province: '身份',
+                        value: [],
+                        type: 'checkbox',
+                        option: [
+                            {
+                                label: '志愿者',
+                                value: 'volunteerFlag'
+                            },
+                            {
+                                label: '楼长',
+                                value: 'buildingChiefFlag'
+                            },
+                            {
+                                label: '单元长',
+                                value: 'unitChiefFlag'
+                            },
+                            {
+                                label: '公益岗',
+                                value: 'publicWelfareFlag'
+                            }
+                        ]
+                    },
+                ]
+            },
+        };
+    },
+    props: {
+        userInfo: {
+            type: Object,
+            default: () => { }
+        },
+        formType: {
+            type: String,
+            default: ''
+        }
+    },
+    created() {
+        this.getDictData();
+    },
+    methods: {
+        async getDictData() {
+            try {
+                const { data } = await this.$http.post('sys/dict/data/dictlist', { dictType: 'special_resident_category' });
+                this.formData.tableData[3].option = data.data
+            } catch (error) {
+                console.log(error);
+            }
+        },
+        updatedForm() {
+            if (this.formType == 'add' || !this.userInfo.baseInfoDto.categoryInfo) return;
+            const updateValue = (flag, dataIndex) => {
+                const { tableData } = this.formData;
+                const valueArray = tableData[dataIndex].value;
+                if (this.userInfo.baseInfoDto.categoryInfo[flag] === 1) {
+                    valueArray.push(flag);
+                } else {
+                    this.formData.tableData[dataIndex].value = valueArray.filter(item => item !== flag);
+                }
+            };
+            if (this.userInfo.baseInfoDto.categoryInfo.specialCrowdFlag == 1) {
+                this.formData.tableData[3].value.push(...this.userInfo.specialDto.specialCategoryCodes);
+            }
+            this.formData.tableData[0].value = this.userInfo.baseInfoDto.categoryInfo.partyFlag;
+            //添加回填需要在这里加上key与对应的index(在formData.tableData中对应的下标)
+            updateValue('disabilityFlag', 1);
+            updateValue('deathFlag', 1);
+            updateValue('seriousIllnessFlag', 1);
+            updateValue('chronicDiseaseFlag', 1);
+            updateValue('emptyNesterFlag', 2);
+            updateValue('liveAloneFlag', 2);
+            updateValue('oldPeopleFlag', 2);
+            updateValue('subsistenceAllowanceFlag', 2);
+            updateValue('veteranFlag', 2);
+            updateValue('ensureHouseFlag', 2);
+            updateValue('specialSupportFlag', 2);
+            updateValue('fertileWomanFlag', 2);
+            updateValue('bereavedPersonFlag', 2);
+            updateValue('volunteerFlag', 4);
+            updateValue('buildingChiefFlag', 4);
+            updateValue('unitChiefFlag', 4);
+            updateValue('publicWelfareFlag', 4);
+        },
+        handeleClickRadio(val) {
+            if (val === 1) {
+                this.$emit('showDialog', { value: val }, val === 1)
+                this.formData.tableData[0].value= 1
+            }else if(this.formType != 'add'){
+                this.$confirm(`确认取消党员标签`, '确认信息', {
+                    confirmButtonText: '确认取消',
+                    cancelButtonText: '暂不取消',
+                    type: 'warning'
+                }).then(() => {
+                    this.$emit('showDialog', { value: val  }, val === 1)
+                }).catch(() => {
+                    this.formData.tableData[0].value= 1
+                });
+            }
+        },
+        handeleClickchckbox(item, event, index) {
+            item.index = index
+            if (event) {
+                this.$emit('showDialog', item, event)
+            } else {
+                this.$confirm(`确认取消${item.label}标签`, '确认信息', {
+                    confirmButtonText: '确认取消',
+                    cancelButtonText: '暂不取消',
+                    type: 'warning'
+                }).then(() => {
+                    this.$emit('showDialog', item, event)
+
+                }).catch(() => {
+                    this.formData.tableData[index].value.push(item.value)
+                });
+            }
+
+        }
+    },
+    components: {},
+    computed: {},
+    watch: {
+        userInfo: {
+            handler(newVal, oldVal) {
+                this.formData.tableData.forEach((item, index) => {
+                    if (index != 0) {
+                        item.value = []
+                    } else {
+                        item.value = ''
+                    }
+                })
+                this.updatedForm()
+            },
+            deep: true,
+            immediate: true
+
+        }
+    },
+}
+</script>
+
+<style lang='scss' scoped>
+::v-deep .el-form-item {
+    margin-bottom: 0px;
+}
+</style>
diff --git a/src/views/modules/portrayal/jumin/cpts/table/changeRecord.vue b/src/views/modules/portrayal/jumin/cpts/table/changeRecord.vue
new file mode 100644
index 000000000..f34c9d8b4
--- /dev/null
+++ b/src/views/modules/portrayal/jumin/cpts/table/changeRecord.vue
@@ -0,0 +1,57 @@
+<template>
+    <div class="table" style="padding:0 16px;">
+
+        <el-table class="m-table-item" :data="tableData" border style="width: 100%; margin-top:23px">
+            <el-table-column label="序号" type="index" fixed="left" align="left" width="50">
+            </el-table-column>
+            <el-table-column v-for="item in tableHeader" :key="item.columnName" :prop="item.columnName" :label="item.label"
+                align="left" :show-overflow-tooltip="true" :width="item.width || ''">
+                <template slot-scope="scope">
+                    <span>{{ handleFilterSpan(scope.row, item) }}</span>
+                </template>
+            </el-table-column>
+        </el-table>
+    </div>
+</template>
+  
+<script>
+export default {
+    components: {},
+    data() {
+        return {
+            tableHeader: [
+                { columnName: "typeName", label: "变更类型", width: 80 },
+                { columnName: "fieldName", label: "变更信息", width: 150 },
+                { columnName: "beforeChangeName", label: "变更前", width: 200 },
+                { columnName: "afterChangeName", label: "变更后", width: 200 },
+                { columnName: "operatorName", label: "操作人", width: 80 },
+                { columnName: "changeTime", label: "调整时间", width: 150 },
+                { columnName: "remark", label: "备注", width: '' },
+            ],
+        };
+    },
+    activated() {
+    },
+    watch: {
+
+    },
+    computed: {
+    },
+    mounted() { },
+    props: {
+        tableData: {
+            type: Array,
+            default: []
+        }
+    },
+    methods: {
+        handleFilterSpan(row, item) {
+            let _val = "";
+            return _val || row[item.columnName];
+        },
+    },
+};
+</script>
+  
+<style scoped lang="scss"></style>
+  
\ No newline at end of file
diff --git a/src/views/modules/portrayal/jumin/cpts/table/complain.vue b/src/views/modules/portrayal/jumin/cpts/table/complain.vue
index deffff527..cc4b0a755 100644
--- a/src/views/modules/portrayal/jumin/cpts/table/complain.vue
+++ b/src/views/modules/portrayal/jumin/cpts/table/complain.vue
@@ -1,6 +1,6 @@
 <template>
     <div class="table">
-        <el-table v-if="tableData.length > 0" :data="tableData" max-height="214px" height="214px">
+        <el-table :data="tableData"  >
             <el-table-column label="序号" type="index" width="80" />
             <el-table-column label="事件类型" prop="categorycode" width="" />
             <el-table-column label="事件描述" prop="eventcontent" width="" />
@@ -13,11 +13,6 @@
                 </template>
             </el-table-column>
         </el-table>
-
-        <div v-else style="width: 100%; height: 363px; text-align: center; padding-top: 120px">
-            <img width="268px" height="128px" src="~@/assets/images/overview/zanwu.png" />
-            <div style="color: #fff">暂无数据</div>
-        </div>
         <sjdetails :showDialog="showDialog" :id="rowId" @close="close" />
     </div>
 </template>
diff --git a/src/views/modules/portrayal/jumin/cpts/table/fuwu.vue b/src/views/modules/portrayal/jumin/cpts/table/fuwu.vue
index f4ee84889..f076a2c91 100644
--- a/src/views/modules/portrayal/jumin/cpts/table/fuwu.vue
+++ b/src/views/modules/portrayal/jumin/cpts/table/fuwu.vue
@@ -1,6 +1,6 @@
 <template>
     <div class="table">
-        <el-table v-if="tableData.length > 0" :data="tableData" max-height="214px" height="214px">
+        <el-table :data="tableData">
             <el-table-column label="序号" type="index" width="80" />
             <el-table-column label="需求类型" prop="serviceCategoryKey" width="" />
             <el-table-column label="事件描述" prop="serviceName" width="" />
@@ -12,10 +12,6 @@
                 </template>
             </el-table-column>
         </el-table>
-        <div v-else style="width: 100%; height: 100%; text-align: center; padding-top: 120px">
-            <img width="268px" height="128px" src="~@/assets/images/overview/zanwu.png" />
-            <div style="color: #fff">暂无数据</div>
-        </div>
         <fwdetail :showDialog="showDialog" :id="rowId" @close="close" />
     </div>
 </template>
diff --git a/src/views/modules/portrayal/jumin/cpts/table/sheng.vue b/src/views/modules/portrayal/jumin/cpts/table/sheng.vue
index edf0ce747..bfdb26447 100644
--- a/src/views/modules/portrayal/jumin/cpts/table/sheng.vue
+++ b/src/views/modules/portrayal/jumin/cpts/table/sheng.vue
@@ -1,6 +1,6 @@
 <template>
     <div class="table">
-        <el-table v-if="tableData.length > 0" :data="tableData" max-height="214px" height="214px">
+        <el-table :data="tableData">
             <el-table-column label="序号" type="index" width="80" />
             <el-table-column label="不满意事项类型" prop="scope" width="190" />
             <el-table-column label="不满意事项描述" prop="problemDesc" width="" />
@@ -12,10 +12,6 @@
                 </template>
             </el-table-column>
         </el-table>
-        <div v-else style="width: 100%; height: 100%; text-align: center; padding-top: 120px">
-            <img width="268px" height="128px" src="~@/assets/images/overview/zanwu.png" />
-            <div style="color: #fff">暂无数据</div>
-        </div>
         <shengdetail :showDialog="showDialog" :id="rowId" @close="close" />
     </div>
 </template>
diff --git a/src/views/modules/portrayal/jumin/cpts/table/shequ.vue b/src/views/modules/portrayal/jumin/cpts/table/shequ.vue
index 2d2eba7cb..4aac5e61d 100644
--- a/src/views/modules/portrayal/jumin/cpts/table/shequ.vue
+++ b/src/views/modules/portrayal/jumin/cpts/table/shequ.vue
@@ -1,6 +1,6 @@
 <template>
     <div class="table">
-        <el-table v-if="tableData.length > 0" :data="tableData" max-height="214px" height="214px">
+        <el-table  :data="tableData">
             <el-table-column label="序号" type="index" width="80" />
             <el-table-column label="不满意事项类型" prop="scope" width="190" />
             <el-table-column label="不满意事项描述" prop="problemDesc" width="" />
@@ -12,10 +12,6 @@
                 </template>
             </el-table-column>
         </el-table>
-        <div v-else style="width: 100%; height: 100%; text-align: center; padding-top: 120px">
-            <img width="268px" height="128px" src="~@/assets/images/overview/zanwu.png" />
-            <div style="color: #fff">暂无数据</div>
-        </div>
         <sqdetail :showDialog="showDialog" :id="rowId" @close="close" />
     </div>
 </template>
diff --git a/src/views/modules/portrayal/jumin/cpts/table/shijian.vue b/src/views/modules/portrayal/jumin/cpts/table/shijian.vue
index aa2cbc3e3..c23163e17 100644
--- a/src/views/modules/portrayal/jumin/cpts/table/shijian.vue
+++ b/src/views/modules/portrayal/jumin/cpts/table/shijian.vue
@@ -1,6 +1,6 @@
 <template>
     <div class="table">
-        <el-table v-if="tableData.length > 0" :data="tableData" max-height="214px" height="214px">
+        <el-table  :data="tableData">
             <el-table-column label="序号" type="index" width="80" />
             <el-table-column label="事件类型" prop="categorycode" width="" />
             <el-table-column label="事件描述" prop="eventcontent" width="" />
@@ -12,17 +12,13 @@
                 </template>
             </el-table-column>
         </el-table>
-        <div v-else style="width: 100%; height: 100%; text-align: center; padding-top: 120px">
-            <img width="268px" height="128px" src="~@/assets/images/overview/zanwu.png" />
-            <div style="color: #fff">暂无数据</div>
-        </div>
         <sjdetail :showDialog="showDialog" :id="rowId" @close="close" />
 
     </div>
 </template>
   
 <script>
-import sjdetail from "../details/sjdetail";
+import sjdetail from "../details/eventdetail";
 export default {
     components: {
         sjdetail
diff --git a/src/views/modules/portrayal/jumin/cpts/table/xuqiu.vue b/src/views/modules/portrayal/jumin/cpts/table/xuqiu.vue
index 6581851d2..9b524c715 100644
--- a/src/views/modules/portrayal/jumin/cpts/table/xuqiu.vue
+++ b/src/views/modules/portrayal/jumin/cpts/table/xuqiu.vue
@@ -1,6 +1,6 @@
 <template>
     <div class="table">
-        <el-table v-if="tableData.length > 0" :data="tableData" max-height="214px" height="214px">
+        <el-table  :data="tableData">
             <el-table-column label="序号" type="index" width="80" />
             <el-table-column label="需求类型" prop="categoryName" width="" />
             <el-table-column label="需求描述" prop="content" width="" />
@@ -12,10 +12,6 @@
                 </template>
             </el-table-column>
         </el-table>
-        <div v-else style="width: 100%; height: 100%; text-align: center; padding-top: 120px">
-            <img width="268px" height="128px" src="~@/assets/images/overview/zanwu.png" />
-            <div style="color: #fff">暂无数据</div>
-        </div>
         <xqdetail :showDialog="showDialog" :id="rowId" @close="close" />
     </div>
 </template>
diff --git a/src/views/modules/portrayal/jumin/cpts/xiangshoufuwu.vue b/src/views/modules/portrayal/jumin/cpts/xiangshoufuwu.vue
deleted file mode 100644
index 2f7329fb6..000000000
--- a/src/views/modules/portrayal/jumin/cpts/xiangshoufuwu.vue
+++ /dev/null
@@ -1,137 +0,0 @@
-<template>
-    <div class="cnt-right">
-        <div class="list">
-            <div class="item f-hflex" :key="index" v-for="(item, index) in list">
-                  <el-row type="flex" class="row">
-                      <el-col :span="12" align="left">{{item.classification}}</el-col>
-                      <el-col :span="12" align="right">{{item.classificationNum || 0}}</el-col>
-                  </el-row>
-                <div class="item-progress">
-                    <b :style="{
-                        width: (item.per == 'NaN'?0:item.per) + '%',
-                    }"></b>
-                </div>
-            </div>
-        </div>
-    </div>
-</template>
-
-<script>
-export default {
-    //数据
-    data() {
-        return {
-            list: [],
-        };
-    },
-    //创建前
-    created() {
-        this.getData();
-    },
-    props: {
-        resiId: {
-            type: String,
-            default: ''
-        }
-    },
-    //方法
-    methods: {
-        getData() {
-            this.$http
-                .get("/actual/base/peopleRoomOverview/serviceNumber?resid=" + this.resiId)
-                .then(({ data: res }) => {
-                    // res.data = [
-                    //     {
-                    //         "classification": "服务找人",
-                    //         "classificationNum": '12'
-                    //     },
-                    //     {
-                    //         "classification": "温暖找人",
-                    //         "classificationNum": '15'
-                    //     },
-                    //     {
-                    //         "classification": "技能找人",
-                    //         "classificationNum": '20'
-                    //     },
-                    //     {
-                    //         "classification": "岗位找人",
-                    //         "classificationNum": '40'
-                    //     }
-                    // ]
-                    let total =  res.data.reduce((sum, item) => sum + Number(item.classificationNum), 0);
-                    res.data =  res.data.map(item => ({
-                        ...item,
-                        per: (Number(item.classificationNum) / total * 100).toFixed(2)   // 保留两位小数
-                    }));
-                    this.list = res.data
-                });
-        },
-    },
-    //子组件注册
-    components: {},
-    //计算
-    computed: {},
-    //监听
-    watch: {},
-}
-</script>
-<style lang="scss" scoped>
-@import "@/assets/scss/modules/management/list-main.scss";
-
-.cnt-right {
-    .list {
-        .item {
-            margin-top: 20px;
-            display: flex;
-            align-items: center;
-            font-size: 14px;
-            font-family: PingFangSC-Medium, PingFang SC;
-            font-weight: 500;
-            color: rgba(44, 53, 66, 0.85);
-            line-height: 24px;
-            cursor: pointer;
-            .row{
-                width: 100%;
-                margin: 0 0 10px;
-                padding: 0 10px 0 0;
-            }
-            .item-name {
-                margin-left: 5px;
-                width: 80px;
-                flex-shrink: 0;
-            }
-
-            .item-div {
-                width: 1px;
-                height: 12px;
-                background: #d8d8d8;
-                border-radius: 1px;
-            }
-
-            .item-count {
-                width: 90px;
-                flex-shrink: 0;
-            }
-
-            .item-per {
-                min-width: 70px;
-            }
-
-            .item-progress {
-                margin-right: 15px;
-                width: 100%;
-                height: 24px;
-                background: #e6f0ff;
-                border-radius: 1px;
-                overflow: hidden;
-
-                b {
-                    display: block;
-                    height: 24px;
-                    background: #7ba6e6;
-                }
-            }
-        }
-    }
-}
-</style>
\ No newline at end of file
diff --git a/src/views/modules/portrayal/jumin/index.vue b/src/views/modules/portrayal/jumin/index.vue
index a31674cac..fcbd35342 100644
--- a/src/views/modules/portrayal/jumin/index.vue
+++ b/src/views/modules/portrayal/jumin/index.vue
@@ -1,112 +1,1586 @@
 <template>
-    <div class='g-main'>
-        <div class="top">
-            <div class="left">
-                <div class="card">
-                    <div class="title">
-                        <div><img src="../../../../assets/images/index/title-icon-sqzl.png" alt="">居民档案</div>
-                        <span class="title f-font14 gray" style="cursor: pointer;" @click="handlerUserInfo">详情 ></span>
-                    </div>
-                    <div class="f-top12">
-                        <img src="../../../../assets/images/index/resi.png" alt="" width="56px"> {{ userInfo.name }}
-                    </div>
-                    <section class="bgC">
-                        <left-top :resiId="userInfo.resiId" :key="userInfo.resiId"></left-top>
-                    </section>
-                </div>
+  <div class="g-main" v-loading="loading">
+    <div class="left">
+      <div class="user">
+        <div v-if="resiDetailObj.baseInfoDto">
+          <img :src="require(`@/assets/images/index/${familyStatus}.png`)" alt="" />
+        </div>
+        <span v-if="resiDetailObj.baseInfoDto">
+          {{ resiDetailObj.baseInfoDto.name }}（{{ resiDetailObj.baseInfoDto.age }}岁）</span
+        >
+        <span v-else> -- </span>
+      </div>
+      <div class="menu">
+        <div class="progress">
+          <div class="text">
+            <span>信息完整度</span> <span>{{ score }}</span>
+          </div>
+          <el-progress :percentage="70" :show-text="false"></el-progress>
+        </div>
+
+        <div class="list">
+          <div
+            :class="{ item: true, active: index == active }"
+            v-for="(item, index) in menuList" :key="index"
+            @click="handelCLickMenu(item.id, index)"
+          >
+            <span>{{ item.name }}</span
+            ><span
+            v-if="item.id != 'businessRecord' && item.id != 'updateRecord' "
+              :class="{
+                incomplete: item.filledQty != item.totalQty && index != active,
+                full: item.filledQty == item.totalQty,
+              }"
+              >（{{ item.filledQty }}/{{ item.totalQty }}）</span
+            >
+          </div>
+        </div>
+      </div>
+    </div>
+    <div class="right">
+      <div class="editBtn">
+        <el-button
+          class="diy-button--add"
+          type="primary"
+          size="small"
+          @click.native="handelClickJumpEdit"
+          >编辑</el-button
+        >
+      </div>
+      <div class="title-small" id="base">基础信息</div>
+      <div class="flex_box">
+        <div  class="f-flex">
+          <div class="f-label"><b>国籍：</b></div>
+          <div
+            class="f-left8 f-font-color"
+            v-if="this.resiDetailObj.baseInfoDto"
+          >
+            {{ nationalityText() }}
+          </div>
+          <div class="f-left8 f-font-color" v-else>--</div>
+        </div>
+        <div  class="f-flex">
+          <div class="f-label"><b>证件类型：</b></div>
+          <div
+            class="f-left8 f-font-color"
+            v-if="this.resiDetailObj.baseInfoDto"
+          >
+            {{ idTypeText() }}
+          </div>
+          <div class="f-left8 f-font-color" v-else>--</div>
+        </div>
+        <div  class="f-flex">
+          <div class="f-label"><b>证件号：</b></div>
+          <div class="f-left8 f-font-color">
+            {{
+              resiDetailObj.baseInfoDto && resiDetailObj.baseInfoDto.idNum
+                ? resiDetailObj.baseInfoDto.idNum
+                : "--"
+            }}
+          </div>
+          <img
+            v-show="showFlagIdCardBtn"
+            src="@/assets/img/yanjing1.png"
+            alt=""
+            width="14px"
+            style="margin-left: 10px"
+          />
+          <img
+            v-show="!showFlagIdCardBtn"
+            src="@/assets/img/yanjing2.png"
+            alt=""
+            width="14px"
+            style="margin-left: 10px"
+          />
+          <el-button
+            type="text"
+            class="div-table-button--blue"
+            size="small"
+            @click="handelCLickShowCheckPassword('idCard')"
+            >{{ showFlagIdCardBtn ? "显示" : "隐藏" }}</el-button
+          >
+        </div>
+        <div  class="f-flex">
+          <div class="f-label"><b>联系电话：</b></div>
+          <div class="f-left8 f-font-color">
+            {{
+              resiDetailObj.baseInfoDto && resiDetailObj.baseInfoDto.mobile
+                ? resiDetailObj.baseInfoDto.mobile
+                : "--"
+            }}
+          </div>
+          <img
+            v-show="showFlagMobileBtn"
+            src="@/assets/img/yanjing1.png"
+            alt=""
+            width="14px"
+            style="margin-left: 10px"
+          />
+          <img
+            v-show="!showFlagMobileBtn"
+            src="@/assets/img/yanjing2.png"
+            alt=""
+            width="14px"
+            style="margin-left: 10px"
+          />
+          <el-button
+            type="text"
+            class="div-table-button--blue"
+            size="small"
+            @click="handelCLickShowCheckPassword('mobile')"
+            >{{ showFlagMobileBtn ? "显示" : "隐藏" }}</el-button
+          >
+        </div>
+     
+        <div  class="f-flex">
+          <div class="f-label">性别：</div>
+          <div class="f-left8 f-font-color">
+            {{
+              resiDetailObj.baseInfoDto && resiDetailObj.baseInfoDto.genderName
+                ? resiDetailObj.baseInfoDto.genderName
+                : "--"
+            }}
+          </div>
+        </div>
+        <div  class="f-flex">
+          <div class="f-label">出生日期：</div>
+          <div class="f-left8 f-font-color" v-if="resiDetailObj.baseInfoDto">
+            {{ resiDetailObj.baseInfoDto.birthday || "--" }}
+          </div>
+        </div>
+        <div  class="f-flex">
+          <div class="f-label">民族：</div>
+          <div class="f-left8 f-font-color">
+            {{
+              resiDetailObj.baseInfoDto && resiDetailObj.baseInfoDto.nationName
+                ? resiDetailObj.baseInfoDto.nationName
+                : "--"
+            }}
+          </div>
+        </div>
+        <div  class="f-flex">
+          <div class="f-label">文化程度：</div>
+          <span class="f-left8 f-font-color">
+            {{
+              resiDetailObj.eduInfoDto &&
+              resiDetailObj.eduInfoDto.cultureLevelName
+                ? resiDetailObj.eduInfoDto.cultureLevelName
+                : "--"
+            }}</span
+          >
+        </div>
+        <div  class="f-flex">
+            <div class="f-label">婚姻状况：</div>
+            <span
+              class="f-left8 f-font-color"
+              v-if="resiDetailObj.familyInfoDto"
+            >
+              {{ categoryDictText() }}</span
+            >
+            <span v-else> -- </span>
+        </div>
+        <div  class="f-flex">
+            <div class="f-label">配偶情况：</div>
+            <span
+              class="f-left8 f-font-color"
+              v-if="resiDetailObj.familyInfoDto"
+              >{{ spouseText() }}</span
+            >
+            <span v-else> -- </span>
+        </div>
+        <div class="f-flex">
+            <div class="f-label">籍贯：</div>
+            <span class="f-left8 f-font-color">{{
+              resiDetailObj.baseInfoDto
+                ? resiDetailObj.baseInfoDto.nativePlace
+                  ? resiDetailObj.baseInfoDto.nativePlace
+                  : "--"
+                : "--"
+            }}</span>
+        </div>
+        <div  class="f-flex">
+          <div class="f-label">备注：</div>
+          <div class="f-left8 f-font-color" v-if="resiDetailObj.baseInfoDto">
+            {{
+              resiDetailObj.baseInfoDto.remark
+                ? resiDetailObj.baseInfoDto.remark
+                : "--"
+            }}
+          </div>
+        </div>
+        <div  class="f-flex">
+          <div class="f-label">创建时间：</div>
+          <span class="f-left8 f-font-color" v-if="resiDetailObj.baseInfoDto">
+            {{
+              resiDetailObj.baseInfoDto.createdTime
+                ? resiDetailObj.baseInfoDto.createdTime
+                : "--"
+            }}</span
+          >
+        </div>
+        <div  class="f-flex">
+            <div class="f-label">更新时间：</div>
+            <span class="f-left8 f-font-color" v-if="resiDetailObj.baseInfoDto">
+              {{
+                resiDetailObj.baseInfoDto.updatedTime
+                  ? resiDetailObj.baseInfoDto.updatedTime
+                  : "--"
+              }}</span
+            >
+          </div>
+      </div>
+      <div class="title-small" id="reside">居住信息</div>
+      <section
+        v-for="(item, indexK) in resiDetailObj.resideInfoDtos"
+        :key="indexK"
+      >
+      <div  class="flex_box">
+        <div class="f-flex">
+              <div class="f-label"><b>所属网格：</b></div>
+              <span class="f-left8 f-font-color">
+                {{ item.gridName || "--" }}
+              </span>
             </div>
-            <div class="right">
-                <div class="card">
-                    <div class="title">
-                        <div><img src="../../../../assets/images/index/title-icon-ywjl.png" alt="">各项业务记录</div>
-                    </div>
-                    <right-top :userInfo="userInfo" :key="userInfo.resiId" :type="'0'"></right-top>
-                </div>
+            <div class="f-flex" style="width: 600px">
+              <div class="f-label"><b>所属房屋：</b></div>
+              <span class="f-left8 f-font-color">
+                {{ item.agencyName + item.homeName  }}
+              </span>
             </div>
         </div>
-        <div class="bottom">
-            <div class="left">
-                <div class="card">
-                    <div class="title">
-                        <div><img src="../../../../assets/images/index/title-icon-jtgx.png" alt="">家庭关系</div>
-                    </div>
-                    <section class="bgC" style="padding: 0;">
-                        <left-bto :userInfo="userInfo" :key="userInfo.resiId" :type="'0'"></left-bto>
-                    </section>
-                </div>
+      <div  class="flex_box">
+        <div class="f-flex">
+              <div class="f-label"><b>人房关系：</b></div>
+              <span class="f-left8 f-font-color">
+                {{
+                  item.resiHouseRel != null
+                    ? item.resiHouseRel === 0
+                      ? "自住"
+                      : item.resiHouseRel === 1
+                      ? "租住"
+                      : "--"
+                    : "--"
+                }}
+              </span>
+          </div>
+            <div class="f-flex">
+              <div class="f-label"><b>人户状况：</b></div>
+              <span class="f-left8 f-font-color">{{
+                householdSituationText(indexK)
+              }}</span>
             </div>
-            <div class="right f-endpoint f-flex">
-                <div class="card  f-w50 right16">
-                    <div class="title">
-                        <div><img src="../../../../assets/images/index/title-icon-xsfw.png" alt="">享受服务次数统计</div>
-                    </div>
-                    <div>
-                        <xiangshoufuwu :key="userInfo.resiId"/>
-                    </div>
-                </div>
-                <div class="card" style="width: calc(50% - 16px);">
-                    <div class="title">
-                        <div><img src="../../../../assets/images/index/title-icon-jfjl.png" alt="">积分记录</div>
-                    </div>
-                    <div class="card">
-                        <pointsRecord :resiId="userInfo.resiId" :key="userInfo.resiId" />
-                    </div>
-                </div>
+          <div  class="f-flex">
+            <div class="f-label">户籍所在地：</div>
+            <div class="f-left8 f-font-color">
+              {{ item.placeOfDomicile || "--" }}
             </div>
+          </div>
+          <div  class="f-flex">
+            <div class="f-label"><b>与户主关系：</b></div>
+            <span class="f-left8 f-font-color">{{
+              houseHolderRelText(indexK)
+            }}</span>
+          </div>
+      </div>
+    </section>
+
+      <div class="title-small" id="ext">拓展信息</div>
+          <section class="flex_box">
+            <div class="f-flex">
+            <div class="f-label">宗教信仰：</div>
+            <span class="f-left8 f-font-color">{{
+              resiDetailObj.religionDto && resiDetailObj.religionDto.religion
+                ? resiDetailObj.religionDto.religion
+                : "--"
+            }}</span>
+          </div>
+          
+        <div  class="f-flex">
+          <div class="f-label"><b>就业状态：</b></div>
+          <span class="f-left8 f-font-color" v-if="resiDetailObj.workInfoDto">
+            {{ careerStatusText() }}
+          </span>
+          <span v-else>--</span>
+        </div>
+        <div
+          
+          class="f-flex"
+          v-if="
+            resiDetailObj.workInfoDto &&
+            resiDetailObj.workInfoDto.careerStatus >= 1 &&
+            resiDetailObj.workInfoDto.careerStatus <= 5
+          "
+        >
+          <div class="f-label">工作单位：</div>
+          <span class="f-left8 f-font-color">{{
+            resiDetailObj.workInfoDto
+              ? resiDetailObj.workInfoDto.workUnit
+                ? resiDetailObj.workInfoDto.workUnit
+                : "--"
+              : "--"
+          }}</span>
+        </div>
+        <div
+          
+          class="f-flex"
+          v-if="
+            resiDetailObj.workInfoDto &&
+            (resiDetailObj.workInfoDto.careerStatus == 0 ||
+              resiDetailObj.workInfoDto.careerStatus == 6)
+          "
+        >
+          <div class="f-label">原工作单位：</div>
+          <span class="f-left8 f-font-color">{{
+            resiDetailObj.unemployedDto
+              ? resiDetailObj.unemployedDto.originWorkUnit
+                ? resiDetailObj.unemployedDto.originWorkUnit
+                : "--"
+              : "--"
+          }}</span>
         </div>
-        <resi-info v-if="showedResiInfo && userInfo.resiId" :resi-id="userInfo.resiId" @close="showedResiInfo = false" />
+        <div
+          
+          class="f-flex"
+          v-if="
+            resiDetailObj.workInfoDto &&
+            resiDetailObj.workInfoDto.careerStatus >= 1 &&
+            resiDetailObj.workInfoDto.careerStatus <= 5
+          "
+        >
+            <div class="f-label">职业：</div>
+            <span class="f-left8 f-font-color">{{
+              resiDetailObj.workInfoDto
+                ? resiDetailObj.workInfoDto.occupation
+                  ? resiDetailObj.workInfoDto.occupation
+                  : "--"
+                : "--"
+            }}</span>
+        </div>
+        <div
+          
+          class="f-flex"
+          v-if="
+            resiDetailObj.workInfoDto &&
+            (resiDetailObj.workInfoDto.careerStatus == 0 ||
+              resiDetailObj.workInfoDto.careerStatus == 6)
+          "
+        >
+          <div class="f-label">失业时间：</div>
+          <span class="f-left8 f-font-color">{{
+            resiDetailObj.unemployedDto
+              ? resiDetailObj.unemployedDto.unemploymentTime
+                ? resiDetailObj.unemployedDto.unemploymentTime
+                : "--"
+              : "--"
+          }}</span>
+        </div>
+        <div
+          
+          class="f-flex"
+          v-if="
+            resiDetailObj.workInfoDto &&
+            resiDetailObj.workInfoDto.careerStatus >= 1 &&
+            resiDetailObj.workInfoDto.careerStatus <= 5
+          "
+        >
+            <div class="f-label">月收入：</div>
+            <span class="f-left8 f-font-color">{{
+              resiDetailObj.economyDto
+                ? resiDetailObj.economyDto.monthIncome
+                  ? resiDetailObj.economyDto.monthIncome
+                  : "--"
+                : "--"
+            }}</span>
+          </div>
+        <div
+          class="f-flex"
+          v-if="
+            resiDetailObj.workInfoDto &&
+            (resiDetailObj.workInfoDto.careerStatus == 0 ||
+              resiDetailObj.workInfoDto.careerStatus == 6)
+          "
+        >
+          <div class="f-label">失业证号：</div>
+          <span class="f-left8 f-font-color">{{
+            resiDetailObj.unemployedDto
+              ? resiDetailObj.unemployedDto.unemploymentNum
+                ? resiDetailObj.unemployedDto.unemploymentNum
+                : "--"
+              : "--"
+          }}</span>
+        </div>
+        <div
+          class="f-flex"
+          v-if="
+            resiDetailObj.workInfoDto &&
+            (resiDetailObj.workInfoDto.careerStatus == 0 ||
+              resiDetailObj.workInfoDto.careerStatus == 6)
+          "
+        >
+          <div class="f-label">失业原因：</div>
+          <span class="f-left8 f-font-color">{{
+            resiDetailObj.unemployedDto
+              ? resiDetailObj.unemployedDto.unemploymentReason
+                ? resiDetailObj.unemployedDto.unemploymentReason
+                : "--"
+              : "--"
+          }}</span>
+        </div>
+        <div class="f-flex">
+          <div class="f-label">有无赡养人：</div>
+          <div class="f-left8 f-font-color">
+            {{
+              resiDetailObj.familyInfoDto &&
+              resiDetailObj.familyInfoDto.elderlyFlag == 1
+                ? "有"
+                : resiDetailObj.familyInfoDto &&
+                  resiDetailObj.familyInfoDto.elderlyFlag == 0
+                ? "无"
+                : "--"
+            }}
+          </div>
+        </div>
+        <div
+          class="f-flex"
+          v-if="
+            resiDetailObj.workInfoDto &&
+            (resiDetailObj.workInfoDto.careerStatus == 0 ||
+              resiDetailObj.workInfoDto.careerStatus == 6)
+          "
+        >
+          <div class="f-label" style="width: 113px">再就业优惠证号：</div>
+          <span class="f-left8 f-font-color">{{
+            resiDetailObj.unemployedDto
+              ? resiDetailObj.unemployedDto.employmentNum
+                ? resiDetailObj.unemployedDto.employmentNum
+                : "--"
+              : "--"
+          }}</span>
+        </div>
+      
+        <div  class="f-flex"  v-if="
+          resiDetailObj.workInfoDto &&
+          (resiDetailObj.workInfoDto.careerStatus == 0 ||
+            resiDetailObj.workInfoDto.careerStatus == 6)
+        ">
+          <div class="f-label" style="width: 113px">技术特长：</div>
+          <span class="f-left8 f-font-color">{{
+            resiDetailObj.unemployedDto
+              ? resiDetailObj.unemployedDto.specialSkill
+                ? resiDetailObj.unemployedDto.specialSkill
+                : "--"
+              : "--"
+          }}</span>
+        </div>
+        <div  class="f-flex"  v-if="
+          resiDetailObj.workInfoDto &&
+          (resiDetailObj.workInfoDto.careerStatus == 0 ||
+            resiDetailObj.workInfoDto.careerStatus == 6)
+        ">
+          <div class="f-label" style="width: 113px">是否领取失业金：</div>
+          <span class="f-left8 f-font-color" v-if="resiDetailObj.unemployedDto">
+            {{
+              resiDetailObj.unemployedDto.unempCompensationFlag != null
+                ? resiDetailObj.unemployedDto.unempCompensationFlag === 0
+                  ? "否"
+                  : resiDetailObj.unemployedDto.unempCompensationFlag === 1
+                  ? "是"
+                  : "--"
+                : "--"
+            }}
+          </span>
+          <span v-else>--</span>
+        </div>
+        <div  class="f-flex"  v-if="
+          resiDetailObj.workInfoDto &&
+          (resiDetailObj.workInfoDto.careerStatus == 0 ||
+            resiDetailObj.workInfoDto.careerStatus == 6)
+        ">
+          <div class="f-label" style="width: 113px">是否就业困难对象：</div>
+          <span class="f-left8 f-font-color" v-if="resiDetailObj.unemployedDto">
+            {{
+              resiDetailObj.unemployedDto.employmentHardFlag != null
+                ? resiDetailObj.unemployedDto.employmentHardFlag === 0
+                  ? "否"
+                  : resiDetailObj.unemployedDto.employmentHardFlag === 1
+                  ? "是"
+                  : "--"
+                : "--"
+            }}
+          </span>
+          <span v-else>--</span>
+        </div>
+        <div  class="f-flex"  v-if="
+          resiDetailObj.workInfoDto &&
+          (resiDetailObj.workInfoDto.careerStatus == 0 ||
+            resiDetailObj.workInfoDto.careerStatus == 6)
+        ">
+          <div class="f-label" style="width: 113px">劳动就业愿望：</div>
+          <span class="f-left8 f-font-color">
+            {{
+              resiDetailObj.workInfoDto
+                ? resiDetailObj.workInfoDto.employmentWish
+                  ? resiDetailObj.workInfoDto.employmentWish
+                  : "--"
+                : "--"
+            }}
+          </span>
+        </div>
+     
+        
+          </section>
+      <div class="title-small">关系图谱</div>
+      <graph
+        :userInfo="resiDetailObj.baseInfoDto"
+        v-if="resiDetailObj.baseInfoDto"
+      />
+      <div class="title-small">人员标签</div>
+      <staff-tag
+        :userInfo="resiDetailObj"
+        ref="staffTag"
+        v-if="Object.keys(resiDetailObj).length !== 0"
+        :formType="'detail'"
+      ></staff-tag>
+      <section
+        v-for="(sectionItem, sectionIndex) in expandList"
+        :key="sectionIndex"
+      >
+        <div class="title-small" :id="sectionItem.scrollId">
+          {{ sectionItem.title }}
+        </div>
+        <section class="flex_box">
+          <div
+          class="f-flex"
+          v-for="(row, rowIndex) in sectionItem.children"
+          :key="rowIndex + sectionItem.id"
+        >
+         
+              <div class="f-label">{{ row.label }}：</div>
+              <span class="f-left8 f-font-color">{{
+                row.value ? row.value : "--"
+              }}</span>
+          </div>
+        </section>
+       
+      </section>
+
+      <div class="title-small" id="businessRecord">业务记录</div>
+      <business-record :userInfo="resiDetailObj"></business-record>
+      <div class="title-small" id="updateRecord">更新记录</div>
+      <change-record :tableData="changeRecordList"></change-record>
     </div>
+    <el-dialog title="密码验证" :visible.sync="showCheckPassword">
+      <el-form :model="form" :rules="rules" ref="form">
+        <el-form-item label="密码" prop="password">
+          <el-input
+            v-model.trim="form.password"
+            autocomplete="off"
+            type="password"
+            placeholder="请输入当前账号密码"
+          ></el-input>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="showCheckPassword = false">取 消</el-button>
+        <el-button type="primary" @click="handelClickCheckPassword"
+          >确 定</el-button
+        >
+      </div>
+    </el-dialog>
+  </div>
 </template>
-<script>
-import { requestPost, requestGet } from '@/js/dai/request'
-import leftTop from "./cpts/leftTop";
-import leftBto from "./cpts/leftBto";
-import rightTop from "./cpts/rightTop";
-// import rightBto from "./cpts/rightBto";
-import resiInfo from "@/views/modules/cpts/resi/info";
-import nextTick from "dai-js/tools/nextTick";
-import pointsRecord from "./cpts/pointsRecord";
-import xiangshoufuwu from "./cpts/xiangshoufuwu";
 
+<script>
+import { requestPost } from "@/js/dai/request";
+import graph from "./cpts/graph.vue";
+import staffTag from "./cpts/staffTag.vue";
+import businessRecord from "./cpts/businessRecord.vue";
+import changeRecord from "./cpts/table/changeRecord.vue";
+import { idTypeList } from "@/js/columns/constants";
 
 export default {
-    //数据
-    data() {
-        return {
-            userInfo: {},
-            showedResiInfo: false,
+  data() {
+    return {
+      loading: false,
+      checkType: "edit", //edit或者view
+      changeRecordList: [], //更新记录
+      resiDetailObj: {}, //居民详情
+      showFlagIdCardBtn: true,
+      showFlagMobileBtn: true,
+      active: 0,
+      menuList: [],
+      score: null,
+
+      nationalityList: [], //国籍字典
+      marriageArr: [], //婚姻状况字典
+      spouseArr: [], //配偶情况字典
+      careerStatusArr: [], //就业状况字典
+      householdSituationArr: [], //户籍情况字典
+      houseHolderRelArr: [], //与户主关系字典
+      idTypeList, //证件类型字典
+      showCheckPassword: false,
+      originalExpandList: [
+        {
+          id: "healthDto",
+          title: "残疾信息",
+          scrollId: "disability",
+          children: [
+            {
+              label: "残疾类别",
+              itemType: "select1",
+              formName: "disabilityCategoryCode",
+              opctionUrl: "sys/dict/data/dictlist",
+              opctionParams: { dictType: "disability_category_code" },
+              opction: [],
+            },
+            {
+              label: "残疾等级",
+              itemType: "select1",
+              formName: "disabilityLevel",
+              opctionUrl: "sys/dict/data/dictlist",
+              opctionParams: { dictType: "disability_level" },
+              opction: [],
+            },
+            {
+              label: "残疾证号",
+              itemType: "input1",
+              formName: "disabilityNum",
+            },
+            {
+              label: "残疾说明",
+              itemType: "input1",
+              formName: "disabilityDesc",
+            },
+            {
+              label: "监护人",
+              itemType: "radio1",
+              formName: "guardianFlag",
+              opction: [
+                { label: "有", formName: "", value: 1 },
+                { label: "无", formName: "", value: 0 },
+              ],
+            },
+            {
+              label: "监护人姓名",
+              itemType: "input1",
+              formName: "guardianName",
+            },
+            {
+              label: "监护人联系电话",
+              itemType: "input1",
+              formName: "guardianMobile",
+            },
+            {
+              label: "技能特长",
+              itemType: "radio1",
+              formName: "specialSkillFlag",
+              opction: [
+                { label: "有", formName: "", value: 1 },
+                { label: "无", formName: "", value: 0 },
+              ],
+            },
+            {
+              label: "劳动能力",
+              itemType: "radio1",
+              formName: "workCapacityFlag",
+              opction: [
+                { label: "有", formName: "", value: 1 },
+                { label: "无", formName: "", value: 0 },
+              ],
+            },
+          ],
+        },
+        {
+          id: "seriousIllnessDto",
+          title: "大病信息",
+          scrollId: "serious_illness",
+          children: [
+            {
+              label: "所患大病",
+              itemType: "checkbox",
+              formName: "illnessCodes",
+              opctionUrl: "sys/dict/data/dictlist",
+              opctionParams: { dictType: "illness_code" },
+              opction: [],
+            },
+          ],
+        },
+        {
+          id: "chronicDiseaseDto",
+          title: "慢病信息",
+          scrollId: "chronic_disease",
+          children: [
+            {
+              label: "所患慢病",
+              itemType: "checkbox",
+              formName: "chronicDiseaseCodes",
+              opctionUrl: "sys/dict/data/dictlist",
+              opctionParams: { dictType: "chronic_disease_code" },
+              opction: [],
+            },
+          ],
+        },
+        {
+          id: "deathDto",
+          title: "死亡信息",
+          scrollId: "death",
+          children: [
+            {
+              label: "死亡时间",
+              itemType: "datepicker1",
+              formName: "deathTime",
+            },
+          ],
+        },
+        {
+          id: "oldPeopleDto",
+          title: "老年人信息",
+          scrollId: "old_people",
+          children: [
+            {
+              label: "老年人分类",
+              itemType: "checkbox",
+              multiple: true,
+              formName: "oldPeopleCategories",
+              opctionUrl: "sys/dict/data/dictlist",
+              opctionParams: { dictType: "oldPeople_categories" },
+            },
+            {
+              label: "居住情况",
+              itemType: "select1",
+              formName: "resideSituation",
+              opctionUrl: "sys/dict/data/dictlist",
+              opctionParams: { dictType: "reside_situation" },
+            },
+            {
+              label: "高龄补助",
+              itemType: "inputNum",
+              formName: "oldSubsidy",
+            },
+          ],
+        },
+        {
+          id: "subsistenceAllowanceDto",
+          title: "低保信息",
+          scrollId: "subsistence_allowance",
+          children: [
+            {
+              label: "低保类别",
+              itemType: "select1",
+              formName: "category",
+              opctionUrl: "sys/dict/data/dictlist",
+              opctionParams: { dictType: "subsistence_allowance_category" },
+            },
+            {
+              label: "低保享受原因",
+              itemType: "checkbox",
+              formName: "reasons",
+              opctionUrl: "sys/dict/data/dictlist",
+              opctionParams: { dictType: "subsistence_allowance_reasons" },
+              opction: [],
+            },
+          ],
+        },
+        {
+          id: "parymemberInfoDto",
+          title: "党员信息",
+          scrollId: "party_member",
+          children: [
+            {
+              label: "入党时间",
+              itemType: "datepicker1",
+              formName: "joinTime",
+              opction: [],
+            },
+            {
+              label: "转正时间",
+              itemType: "datepicker1",
+              formName: "positiveTime",
+              opction: [],
+            },
+            {
+              label: "所属党组织",
+              itemType: "cascader1",
+              formName: "partyOrgId",
+              opction: [],
+            },
+            {
+              label: "流动党员",
+              itemType: "radio1",
+              formName: "flowFlag",
+              opction: [
+                { label: "是", value: 1 },
+                { label: "否", value: 0 },
+              ],
+            },
+            {
+              label: "流动党员活动证号",
+              itemType: "input1",
+              formName: "flowActNum",
+            },
+            {
+              label: "职务",
+              itemType: "select1",
+              formName: "partyJob",
+              opctionUrl: "sys/dict/data/dictlist",
+              opctionParams: { dictType: "party_job" },
+              opction: [],
+            },
+            {
+              label: "工作职责",
+              itemType: "input1",
+              formName: "duty",
+            },
+            {
+              label: "是否退休",
+              itemType: "radio1",
+              formName: "retiredFlag",
+              opction: [
+                { label: "是", value: 1 },
+                { label: "否", value: 0 },
+              ],
+            },
+            {
+              label: "党员中心户",
+              itemType: "radio1",
+              formName: "centerFlag",
+              opction: [
+                { label: "是", value: 1 },
+                { label: "否", value: 0 },
+              ],
+            },
+            {
+              label: "免学习",
+              itemType: "radio1",
+              formName: "studyNotNeed",
+              opction: [
+                { label: "是", value: 1 },
+                { label: "否", value: 0 },
+              ],
+            },
+            {
+              label: "入党时所在党支部",
+              itemType: "input1",
+              formName: "joinBranchName",
+            },
+            {
+              label: "组织关系转入社区时间",
+              itemType: "datepicker1",
+              formName: "joinCommunityTime",
+              opction: [],
+            },
+          ],
+        },
+        {
+          id: "ensureHouseDto",
+          title: "保障房信息",
+          scrollId: "ensure_house",
+          children: [
+            {
+              label: "所在社区",
+              itemType: "input1",
+              formName: "liveCommunity",
+            },
+            {
+              label: "住房性质",
+              itemType: "select1",
+              formName: "housingNature",
+              opctionUrl: "sys/dict/data/house",
+              opctionParams: { formCode: "resi_base_info" },
+              opction: [],
+            },
+          ],
+        },
+        {
+          id: "veteranDto",
+          title: "退役军人信息",
+          scrollId: "veteran",
+          children: [
+            {
+              label: "入伍时间",
+              itemType: "datepicker1",
+              formName: "joinArmyTime",
+              opction: [],
+            },
+            {
+              label: "退伍时间",
+              itemType: "datepicker1",
+              formName: "leaveArmyTime",
+              opction: [],
+            },
+            {
+              label: "服役单位",
+              itemType: "input1",
+              formName: "serviceUnit",
+            },
+            {
+              label: "接收单位",
+              itemType: "input1",
+              formName: "receiveUnit",
+            },
+            {
+              label: "待安置补助金",
+              itemType: "inputNum",
+              formName: "settlementAmount",
+              opction: [],
+            },
+            {
+              label: "培训状况",
+              itemType: "input1",
+              formName: "trainDesc",
+            },
+            {
+              label: "现就业情况",
+              itemType: "input1",
+              formName: "employmentSituation",
+            },
+            {
+              label: "是否办理公益性岗位",
+              itemType: "radio1",
+              formName: "pubWelfareJobFlag",
+              opction: [
+                { label: "是", value: 1 },
+                { label: "否", value: 0 },
+              ],
+            },
+          ],
+        },
+        {
+          id: "unitedFrontDto",
+          title: "统战人员信息",
+          scrollId: "united_front",
+          children: [
+            {
+              label: "统战类型",
+              itemType: "input1",
+              formName: "unitedFrontType",
+            },
+          ],
+        },
+        {
+          id: "volunteerDto",
+          title: "志愿者信息",
+          children: [
+            {
+              label: "志愿者类别",
+              itemType: "checkbox",
+              formName: "volunteerCategory",
+              opctionUrl: "sys/dict/data/dictlist",
+              opctionParams: { dictType: "VOLUNTEER_CATEGORY" },
+              opction: [],
+            },
+          ],
+        },
+        {
+          id: "specialSupportDto",
+          title: "特扶人员信息",
+          scrollId: "special_support",
+          children: [
+            {
+              //0
+              label: "特扶类别",
+              itemType: "select1",
+              formName: "specialSupportType",
+              opction: [
+                {
+                  value: "1",
+                  label: "失独",
+                },
+                {
+                  value: "2",
+                  label: "伤残",
+                },
+              ],
+            },
+            {
+              //1
+              label: "子女姓名",
+              itemType: "input1",
+              formName: "childName",
+              opction: [],
+            },
+            {
+              //2
+              label: "子女性别",
+              itemType: "select1",
+              formName: "childGender",
+              opction: [
+                {
+                  value: "1",
+                  label: "男",
+                },
+                {
+                  value: "2",
+                  label: "女",
+                },
+              ],
+            },
+            {
+              label: "子女死亡日期",
+              itemType: "datepicker1",
+              formName: "childDeathDate",
+              opction: [],
+            },
+            {
+              label: "子女伤残类别",
+              itemType: "select1",
+              formName: "childDisabilityCategoryCode",
+              opctionUrl: "sys/dict/data/dictlist",
+              opctionParams: { dictType: "disability_category_code" },
+              opction: [],
+            },
+            {
+              label: "子女伤残等级",
+              itemType: "select1",
+              formName: "childDisabilityLevel",
+              opctionUrl: "sys/dict/data/dictlist",
+              opctionParams: { dictType: "disability_level" },
+              opction: [],
+            },
+          ],
+        },
+      ],
+      expandList: [],
+      form: {
+        password: "", //脱敏确认密码
+      },
+      rules: {
+        password: [{ required: true, message: "请输入密码", trigger: "blur" }],
+      },
+      incidence: {
+        partyFlag: {
+          formId: "parymemberInfoDto",
+          formType: "parymemberInfoDto",
+          title: "党员信息",
+        },
+        disabilityFlag: {
+          formId: "healthDto",
+          formType: "healthDto",
+          title: "残疾信息",
+        },
+        seriousIllnessFlag: {
+          formId: "seriousIllnessDto",
+          formType: "seriousIllnessDto",
+          title: "大病信息",
+        },
+        chronicDiseaseFlag: {
+          formId: "chronicDiseaseDto",
+          formType: "chronicDiseaseDto",
+          title: "慢病信息",
+        },
+        deathFlag: { formId: "deathDto", formType: "deathDto", title: "死亡" },
+        oldPeopleFlag: {
+          formId: "oldPeopleDto",
+          formType: "oldPeopleDto",
+          title: "老年人信息",
+        },
+        subsistenceAllowanceFlag: {
+          formId: "subsistenceAllowanceDto",
+          formType: "subsistenceAllowanceDto",
+          title: "低保人员信息",
+        },
+        veteranFlag: {
+          formId: "veteranDto",
+          formType: "veteranDto",
+          title: "退役军人信息",
+        },
+        ensureHouseFlag: {
+          formId: "ensureHouseDto",
+          formType: "ensureHouseDto",
+          title: "保障性住房信息",
+        },
+        specialSupportFlag: {
+          formId: "specialSupportDto",
+          formType: "specialSupportDto",
+          title: "特扶人员",
+        },
+        unitedFrontFlag: {
+          formId: "unitedFrontDto",
+          formType: "unitedFrontDto",
+          title: "统战人员",
+        },
+        volunteerFlag: {
+          formId: "volunteerDto",
+          formType: "volunteerDto",
+          title: "志愿者",
+        },
+      },
+    };
+  },
+  components: { graph, staffTag, businessRecord, changeRecord },
+  created() {},
+  mounted() {},
+  activated() {},
+  methods: {
+    // 更新记录
+    async getChangeRecordDetailById() {
+      try {
+        const { data } = await this.$http.post(
+          `/actual/base/residentChangeRecord/getChangeRecordsById/${this.resiId}`
+        );
+        if (data.data == null) {
+          this.changeRecordList = [];
+        } else {
+          this.changeRecordList = data.data;
+        }
+      } catch (error) {
+        console.log(error);
+      }
+    },
+    async getNationalityList() {
+      try {
+        const { data } = await this.$http.post("sys/dict/data/dictlist", {
+          dictType: "nationality",
+        });
+        this.nationalityList = data.data;
+      } catch (error) {
+        console.log(error, `获取 ${dictType} 字典`);
+      }
+    },
+    getResiDetail() {
+      this.$http
+        .get(`/actual/base/residentIntegratedInfo/detail/masked/${this.resiId}`)
+        .then(async (res) => {
+          if (res.data.code === 0) {
+            this.resiDetailObj = res.data.data || {};
+            const nameMap = {
+              reside: "居住信息",
+              ext: "拓展信息",
+              united_front: "统战人员信息",
+              party_member: "党员信息",
+              death: "死亡信息",
+              disability: "残疾信息",
+              subsistence_allowance: "低保信息",
+              serious_illness: "大病信息",
+              veteran: "退役军人信息",
+              special_support: "特扶人员信息",
+              old_people: "老年人信息",
+              ensure_house: "保障房信息",
+              chronic_disease: "慢病信息",
+              base: "基本信息",
+              business_record:'业务记录',
+              update_record:'更新记录'
+            };
+            const keysWithValueOne = [];
+            for (const key in this.resiDetailObj.baseInfoDto.categoryInfo) {
+                if (this.resiDetailObj.baseInfoDto.categoryInfo[key] === 1 && this.incidence[key]) {
+                    keysWithValueOne.push(this.incidence[key].formId);
+                }
+            }
+            const keysWithValueOneName= keysWithValueOne.map(str => {
+                const matchedObject = this.originalExpandList.find(obj => obj.id === str);
+                return matchedObject ? matchedObject.title : null;
+            });
+            this.menuList = Object.entries(
+              res.data.data.integrityData.integrityQtyMap
+            )
+            
+              .map(([key, value]) => ({
+                name: nameMap[key],
+                id: key,
+                filledQty: value.filledQty,
+                totalQty: value.totalQty,
+              }))
+              .reverse();
+             
+            for(let i in keysWithValueOneName){
+              for(let k in this.originalExpandList){
+                if(keysWithValueOneName[i] === this.originalExpandList[k].title){
+                  for(let c in this.menuList){
+                      if(this.menuList[c].name === keysWithValueOneName[i] || this.menuList[c].name === '基本信息' || this.menuList[c].name === '拓展信息' || this.menuList[c].name === '居住信息' ){
+                        if(this.menuList.findIndex(item=>item.name === keysWithValueOneName[i]) === -1){
+                          this.menuList.push(this.menuList[c])
+                        }
+                      }
+                  }
 
-        };
+                }
+              }
+            }
+            this.menuList = this.menuList.filter((itemA) => {
+              return  keysWithValueOneName.some((itemB) => itemB === itemA.name)|| itemA.name === '基本信息' || itemA.name === '拓展信息' || itemA.name === '居住信息';
+            });
+            this.menuList.push(
+              {
+                name: "业务记录",
+                id: "businessRecord",
+              },
+              {
+                name: "更新纪录",
+                id: "updateRecord",
+              }
+            );
+            const orderIds = ["base", "reside", "ext"];
+            // 新建一个数组存放按顺序排列的项
+            let sortedData = [];
+            // 遍历 orderIds 数组，将对应的项从 data 中取出并放入 sortedData
+            orderIds.forEach(id => {
+                const item = this.menuList.find(item => item.id === id);
+                if (item) {
+                    sortedData.push(item);
+                }
+            });
+            console.log(sortedData);
+            // 将 data 中剩余的项放入 sortedData
+            this.menuList.forEach(item => {
+                if (!orderIds.includes(item.id)) {
+                    sortedData.push(item);
+                }
+            });
+            this.menuList = sortedData;
+            this.expandList = this.originalExpandList.filter((itemA) => {
+              return keysWithValueOne.some((itemB) => itemB === itemA.id);
+            });
+            await Promise.all(
+              this.expandList.map(async (item) => {
+                await Promise.all(
+                  item.children.map(async (child) => {
+                    const key = child.formName;
+                    if(this.resiDetailObj[item.id]){
+                      if (this.resiDetailObj[item.id].hasOwnProperty(key)) {
+                      child.value = await this.getDictName(
+                        child.opctionUrl,
+                        child.opctionParams,
+                        this.resiDetailObj[item.id][
+                          key == "partyOrgId" ? "branchId" : key
+                        ],
+                        child.itemType,
+                        child.opction
+                      );
+                    }
+                    }
+                    
+                  })
+                );
+              })
+            );
+            this.score = res.data.data.integrityData.score;
+          } else if (res.data.code >= 8000) {
+            this.resiDetailObj = {};
+            this.$message.error(res.data.msg);
+          }
+        })
+        .catch((err) => {
+          console.log(err);
+        });
     },
-    //创建前
-    async created() {
-        this.userInfo = this.$store.state.huaXiang.userInfo
+    // async handleSaveTuomin1() {
+    //   const url = `/actual/base/residentBaseInfo/getResiUserInfo/${this.resiId}`;
+    //   let parm = {
+    //     password,
+    //   };
+    //   const { data, code, msg } = await requestPost(url, parm);
+    // },
+   async  handelClickJumpEdit() {
+      const url = `/actual/base/residentCategoryUpdateInfo/isUpdater/${this.resiId}`;
+      const { data, code, msg } = await requestPost(url);
+      if(code==0){
+          if(data==true){
+            this.handleSaveTuomin()
+          }
+          else{
+            this.checkType = "edit";
+            this.showCheckPassword = true;
+          }
+      }
+      else{
+        this.$message.error(msg);
+      }
     },
-    mounted() {
+    async getDictName(url, params, value, itemType, opction) {
+      try {
+        if (url) {
+          const { data } = await this.$http.post(url, params);
+          const dictData = data.data;
+          if (itemType == "checkbox") {
+            const matchedLabels = value
+              .map((item) => {
+                const matchedItems = dictData.filter(
+                  (obj) => obj.value === item
+                );
+                if (matchedItems.length > 0) {
+                  return matchedItems
+                    .map((matchedItem) => matchedItem.label)
+                    .join(",");
+                } else {
+                  return "";
+                }
+              })
+              .join("，");
+            return matchedLabels ? matchedLabels : "--";
+          } else if (itemType == "select1") {
+            const matchedItem = dictData.find((item) => item.value === value);
+            return matchedItem ? matchedItem.label : "--";
+          }
+        } else {
+          if (itemType == "radio1") {
+            const matchedItem = opction.find((item) => item.value === value);
+            return matchedItem ? matchedItem.label : "--";
+          } else if (
+            itemType == "input1" ||
+            itemType == "datepicker1" ||
+            itemType == "cascader1"
+          ) {
+            return value ? value : "--";
+          }
+        }
+      } catch (error) {
+        console.log(error);
+      }
     },
-    activated() {
-        this.userInfo = this.$store.state.huaXiang.userInfo
+
+      handelCLickMenu(id, index) {
+      this.active = index;
+      const bottomElement = document.getElementById(`${id}`);
+      const topOffset = -120; // 减少的高度值
+      const topPos = bottomElement.getBoundingClientRect().top + window.pageYOffset + topOffset;
+      window.scrollTo({ top: topPos, behavior: "smooth" });
     },
-    //方法
-    methods: {
-        async handlerUserInfo() {
-            await nextTick();
-            this.showedResiInfo = true;
-        },
-        changeTotal(val) {
-            this.total = val.total
-        },
+
+
+    handelCLickShowCheckPassword(type) {
+      this.form.password = "";
+      this.checkType = "view";
+      if (type === "idCard") {
+        if (this.showFlagIdCardBtn) {
+          this.showCheckPassword = true;
+        } else {
+          this.showFlagIdCardBtn = true;
+          this.$set(
+            this.resiDetailObj.baseInfoDto,
+            "idNum",
+            this.resiDetailObj.baseInfoDto.idNum.substr(0, 11) +
+              "****" +
+              this.resiDetailObj.baseInfoDto.idNum.substr(16, 2)
+          );
+        }
+      } else if (type === "mobile") {
+        if (this.showFlagMobileBtn) {
+          this.showCheckPassword = true;
+        } else {
+          this.showFlagMobileBtn = true;
+          this.$set(
+            this.resiDetailObj.baseInfoDto,
+            "mobile",
+            this.resiDetailObj.baseInfoDto.mobile.substr(0, 3) +
+              "****" +
+              this.resiDetailObj.baseInfoDto.mobile.substr(7, 4)
+          );
+        }
+      }
+      this.tuominType = type;
+    },
+    nationalityText() {
+      let text = "--";
+      this.nationalityList.forEach((item) => {
+        if (item.value == this.resiDetailObj.baseInfoDto.nationality) {
+          text = item.label;
+        }
+      });
+      return text;
+    },
+    categoryDictText() {
+      let text = "--";
+      this.marriageArr.forEach((item) => {
+        if (item.value == this.resiDetailObj.familyInfoDto.marriage) {
+          text = item.label;
+        }
+      });
+      return text;
+    },
+    spouseText() {
+      let text = "--";
+      this.spouseArr.forEach((item) => {
+        if (item.value == this.resiDetailObj.familyInfoDto.spouseSituation) {
+          text = item.label;
+        }
+      });
+      return text;
+    },
+    careerStatusText() {
+      let text = "--";
+      this.careerStatusArr.forEach((item) => {
+        if (item.value == this.resiDetailObj.workInfoDto.careerStatus) {
+          text = item.label;
+        }
+      });
+      return text;
+    },
+    idTypeText() {
+      let text = "--";
+      this.idTypeList.forEach((item) => {
+        if (item.value == this.resiDetailObj.baseInfoDto.idType) {
+          text = item.label;
+        }
+      });
+      return text;
+    },
+    handelClickCheckPassword() {
+      this.$refs.form.validate((vali) => {
+        if (vali) {
+          this.handleSaveTuomin(this.form.password);
+        } else {
+          return false;
+        }
+      });
+    },
+    async handleSaveTuomin(password) {
+      const url = `/actual/base/residentBaseInfo/getResiUserInfo/${this.resiId}`;
+      let parm = {
+        password,
+      };
+      const { data, code, msg } = await requestPost(url, parm);
+      if (code === 0) {
+        if (this.checkType == "view") {
+          if (this.tuominType === "mobile") {
+            this.$set(this.resiDetailObj.baseInfoDto, "mobile", data.mobile);
+            this.showFlagMobileBtn = !this.showFlagMobileBtn;
+          }
+          if (this.tuominType === "idCard") {
+            this.$set(this.resiDetailObj.baseInfoDto, "idNum", data.idNum);
+            this.showFlagIdCardBtn = !this.showFlagIdCardBtn;
+          }
+          this.showCheckPassword = false;
+        } else if (this.checkType == "edit") {
+          this.showCheckPassword = false;
+          this.$router.push({
+            name: "edit-resi",
+            query: { id: data.id },
+            params: { idNum: data.idNum, mobile: data.mobile ,name:data.name},
+          });
+        }
+      } else {
+        this.$message.error(msg);
+      }
+    },
+
+    // 婚姻状况字典
+    async getMarriage() {
+      try {
+        const { data } = await this.$http.post("sys/dict/data/dictlist", {
+          dictType: "marriage",
+        });
+        this.marriageArr = data.data;
+      } catch (error) {
+        console.log(error, "获取婚姻状况字典");
+      }
+    },
+    // 就业状态字典
+    async getCareerStatus() {
+      try {
+        const { data } = await this.$http.post("sys/dict/data/dictlist", {
+          dictType: "career_status",
+        });
+        this.careerStatusArr = data.data;
+      } catch (error) {
+        console.log(error, "获取就业状态字典");
+      }
+    },
+    // 人户状况
+    async getHouseholdSituation() {
+      try {
+        const { data } = await this.$http.post("sys/dict/data/dictlist", {
+          dictType: "household_situation",
+        });
+        this.householdSituationArr = data.data;
+      } catch (error) {
+        console.log(error, "获取人户状况");
+      }
+    },
+    // 配偶情况
+    async getSpouse() {
+      try {
+        const { data } = await this.$http.post("sys/dict/data/dictlist", {
+          dictType: "spouse_situation",
+        });
+        this.spouseArr = data.data;
+      } catch (error) {
+        console.log(error, "获取配偶情况字典");
+      }
+    },
+    // 与户主关系
+    async gethouseHolderRel() {
+      try {
+        const { data } = await this.$http.post("sys/dict/data/relationship", {
+          formCode: "resi_base_info",
+        });
+        this.houseHolderRelArr = data.data;
+        this.loading = false;
+      } catch (error) {
+        console.log(error, "获取与户主关系");
+        this.loading = false;
+      }
+    },
+    houseHolderRelText(index) {
+      let text = "--";
+      this.houseHolderRelArr.forEach((item) => {
+        if (
+          item.value == this.resiDetailObj.resideInfoDtos[index].houseHolderRel
+        ) {
+          text = item.label;
+        }
+      });
+      return text;
+    },
+    householdSituationText(index) {
+      let text = "--";
+      this.householdSituationArr.forEach((item) => {
+        if (
+          item.value ==
+          this.resiDetailObj.resideInfoDtos[index].householdSituation
+        ) {
+          text = item.label;
+        }
+      });
+      return text;
+    },
+  },
+  computed: {
+    familyStatus(){
+      var status = '';
+      if(this.resiDetailObj.baseInfoDto){
+          if(this.resiDetailObj.baseInfoDto.gender =='1' && this.resiDetailObj.baseInfoDto.age <=18){
+            status =  'son'
+          }else if(this.resiDetailObj.baseInfoDto.gender =='1' && this.resiDetailObj.baseInfoDto.age >18 && this.resiDetailObj.baseInfoDto.age <60){
+              status =  'father'
+          }else if(this.resiDetailObj.baseInfoDto.gender =='1' && this.resiDetailObj.baseInfoDto.age >=60){
+              status =  'grandpa'
+          }else if(this.resiDetailObj.baseInfoDto.gender =='2' && this.resiDetailObj.baseInfoDto.age >=60){
+              status =  'grandma'
+          }else if(this.resiDetailObj.baseInfoDto.gender =='2' && ( this.resiDetailObj.baseInfoDto.age >18 && this.resiDetailObj.baseInfoDto.age <60)){
+              status =  'mother'
+          } else if(this.resiDetailObj.baseInfoDto.gender =='2' && this.resiDetailObj.baseInfoDto.age <= 18){
+                status =  'girl'
+          }else if(this.resiDetailObj.baseInfoDto.gender =='0'){
+            status =  'father'
+          }
+      } 
+      return status
+    }
+  },
+  watch: {
+    "$store.state.huaXiang.userInfo.resiId": {
+      handler(newValue, oldValue) {
+        this.loading = true;
+        this.resiId = newValue;
+        this.resiDetailObj = {};
+        this.getNationalityList();
+        this.getResiDetail();
+        this.getMarriage();
+        this.getSpouse();
+        this.getCareerStatus();
+        this.getChangeRecordDetailById();
+        this.getHouseholdSituation();
+        this.gethouseHolderRel();
+      },
+      deep: true, // 开启深度监听
+      immediate: true, // 立即触发一次handler
     },
-    //子组件注册
-    components: { leftTop, leftBto, resiInfo, rightTop, pointsRecord, xiangshoufuwu },
-    //计算
-    computed: {},
-    //监听
-    watch: {},
-}
+  },
+};
 </script>
 
 <style lang="scss" scoped>
-@import "@/assets/scss/pages/huaxiang";
+@import "@/assets/scss/pages/resiInfo.scss";
 @import "@/assets/scss/modules/management/list-main.scss";
 </style>
diff --git a/src/views/modules/productConfig/MiniDraft.vue b/src/views/modules/productConfig/MiniDraft.vue
index 6b058f760..c4f39e9cf 100644
--- a/src/views/modules/productConfig/MiniDraft.vue
+++ b/src/views/modules/productConfig/MiniDraft.vue
@@ -4,7 +4,7 @@
     <el-card shadow="never"
              class="aui-card--fill">
       <el-tabs @tab-click="tabClick"
-               v-model="activeName"
+               v-model.trim="activeName"
                class="el-tabs">
         <el-tab-pane label="草稿箱"
                      name="draft">
diff --git a/src/views/modules/productConfig/autoTest/autoTestList copy.vue b/src/views/modules/productConfig/autoTest/autoTestList copy.vue
index ea7eabdd0..afabe834b 100644
--- a/src/views/modules/productConfig/autoTest/autoTestList copy.vue	
+++ b/src/views/modules/productConfig/autoTest/autoTestList copy.vue	
@@ -12,7 +12,7 @@
     </div>
     <div class="mod-sys__menu">
 
-      <el-tabs v-model="activeName"
+      <el-tabs v-model.trim="activeName"
                @tab-click="tabChange"
                class="el-tabs">
         <el-tab-pane label="组织机构、人员配置"
@@ -36,7 +36,7 @@
               <template slot-scope="scope">
                 <el-input v-if="(scope.row.type==='street'||scope.row.type==='community')"
                           class="num_input"
-                          v-model="scope.row.dangjian"
+                          v-model.trim="scope.row.dangjian"
                           label="描述文字"></el-input>
                 <span v-else>{{"--"}}</span>
               </template>
@@ -50,7 +50,7 @@
               <template slot-scope="scope">
                 <el-input v-if="scope.row.type==='grid'||scope.row.type==='department'"
                           class="num_input"
-                          v-model="scope.row.wangge"
+                          v-model.trim="scope.row.wangge"
                           label="描述文字"></el-input>
                 <span v-else>{{"--"}}</span>
               </template>
@@ -65,13 +65,13 @@
               <template slot-scope="scope">
                 <el-input v-if="scope.row.type==='grid'"
                           class="num_input"
-                          v-model="scope.row.rexin_yes"
+                          v-model.trim="scope.row.rexin_yes"
                           label="描述文字"></el-input>
                 <span v-else>{{"--"}}</span>
                 <span>{{' / '}}</span>
                 <el-input v-if="scope.row.type==='grid'"
                           class="num_input"
-                          v-model="scope.row.rexin"
+                          v-model.trim="scope.row.rexin"
                           label="描述文字"></el-input>
                 <span v-else>{{"--"}}</span>
               </template>
@@ -85,13 +85,13 @@
               <template slot-scope="scope">
                 <el-input v-if="scope.row.type==='grid'"
                           class="num_input"
-                          v-model="scope.row.dangyuan_yes"
+                          v-model.trim="scope.row.dangyuan_yes"
                           label="描述文字"></el-input>
                 <span v-else>{{"--"}}</span>
                 <span>{{' / '}}</span>
                 <el-input v-if="scope.row.type==='grid'"
                           class="num_input"
-                          v-model="scope.row.dangyuan"
+                          v-model.trim="scope.row.dangyuan"
                           label="描述文字"></el-input>
                 <span v-else>{{"--"}}</span>
               </template>
@@ -105,7 +105,7 @@
               <template slot-scope="scope">
                 <el-input v-if="scope.row.type==='grid'"
                           class="num_input"
-                          v-model="scope.row.renzheng"
+                          v-model.trim="scope.row.renzheng"
                           label="描述文字"></el-input>
                 <span v-else>{{"--"}}</span>
               </template>
@@ -119,13 +119,13 @@
               <template slot-scope="scope">
                 <el-input v-if="scope.row.type==='grid'"
                           class="num_input"
-                          v-model="scope.row.xiaozu_dangyuan"
+                          v-model.trim="scope.row.xiaozu_dangyuan"
                           label="描述文字"></el-input>
                 <span v-else>{{"--"}}</span>
                 <span>{{' / '}}</span>
                 <el-input v-if="scope.row.type==='grid'"
                           class="num_input"
-                          v-model="scope.row.xiaozu_rexin"
+                          v-model.trim="scope.row.xiaozu_rexin"
                           label="描述文字"></el-input>
                 <span v-else>{{"--"}}</span>
               </template>
@@ -179,7 +179,7 @@
               <template slot-scope="scope">
                 <el-input v-if="scope.row.type==='topic'"
                           class="num_input"
-                          v-model="scope.row.renshu"
+                          v-model.trim="scope.row.renshu"
                           label="描述文字"></el-input>
                 <span v-else>{{"--"}}</span>
               </template>
@@ -193,7 +193,7 @@
               <template slot-scope="scope">
                 <el-input v-if="scope.row.type==='topic'"
                           class="num_input"
-                          v-model="scope.row.huati"
+                          v-model.trim="scope.row.huati"
                           label="描述文字"></el-input>
                 <span v-else>{{"--"}}</span>
               </template>
@@ -207,7 +207,7 @@
               <template slot-scope="scope">
                 <el-input v-if="scope.row.type==='topic'"
                           class="num_input"
-                          v-model="scope.row.huatipinglun"
+                          v-model.trim="scope.row.huatipinglun"
                           label="描述文字"></el-input>
 
                 <span v-else>{{"--"}}</span>
@@ -223,7 +223,7 @@
               <template slot-scope="scope">
                 <el-input v-if="scope.row.type==='topic'"
                           class="num_input"
-                          v-model="scope.row.huatipingbi"
+                          v-model.trim="scope.row.huatipingbi"
                           label="描述文字"></el-input>
                 <span v-else>{{"--"}}</span>
 
@@ -238,7 +238,7 @@
               <template slot-scope="scope">
                 <el-input v-if="scope.row.type==='topic'"
                           class="num_input"
-                          v-model="scope.row.huatiguanbi"
+                          v-model.trim="scope.row.huatiguanbi"
                           label="描述文字"></el-input>
                 <span v-else>{{"--"}}</span>
 
@@ -253,7 +253,7 @@
               <template slot-scope="scope">
                 <el-input v-if="scope.row.type==='topic'"
                           class="num_input"
-                          v-model="scope.row.zhuanyiti"
+                          v-model.trim="scope.row.zhuanyiti"
                           label="描述文字"></el-input>
                 <span v-else>{{"--"}}</span>
 
@@ -269,7 +269,7 @@
               <template slot-scope="scope">
                 <el-input v-if="scope.row.type==='topic'"
                           class="num_input"
-                          v-model="scope.row.yitizhichi"
+                          v-model.trim="scope.row.yitizhichi"
                           label="描述文字"></el-input>
                 <span v-else>{{"--"}}</span>
 
@@ -285,7 +285,7 @@
               <template slot-scope="scope">
                 <el-input v-if="scope.row.type==='topic'"
                           class="num_input"
-                          v-model="scope.row.yitifandui"
+                          v-model.trim="scope.row.yitifandui"
                           label="描述文字"></el-input>
                 <span v-else>{{"--"}}</span>
 
@@ -301,7 +301,7 @@
               <template slot-scope="scope">
                 <el-input v-if="scope.row.type==='topic'"
                           class="num_input"
-                          v-model="scope.row.yitiguanbi"
+                          v-model.trim="scope.row.yitiguanbi"
                           label="描述文字"></el-input>
                 <span v-else>{{"--"}}</span>
 
@@ -316,7 +316,7 @@
               <template slot-scope="scope">
                 <el-input v-if="scope.row.type==='topic'"
                           class="num_input"
-                          v-model="scope.row.zhuanxiangmu"
+                          v-model.trim="scope.row.zhuanxiangmu"
                           label="描述文字"></el-input>
                 <span v-else>{{"--"}}</span>
 
@@ -331,7 +331,7 @@
               <template slot-scope="scope">
                 <el-input v-if="scope.row.type==='topic'"
                           class="num_input"
-                          v-model="scope.row.xiangmuguanbi"
+                          v-model.trim="scope.row.xiangmuguanbi"
                           label="描述文字"></el-input>
                 <span v-else>{{"--"}}</span>
 
@@ -363,7 +363,7 @@
               <template slot-scope="scope">
                 <el-input v-if="scope.row.type==='topic'"
                           class="num_input"
-                          v-model="scope.row.chulicishu"
+                          v-model.trim="scope.row.chulicishu"
                           label="描述文字"></el-input>
                 <span v-else>{{"--"}}</span>
               </template>
@@ -377,7 +377,7 @@
               <template slot-scope="scope">
                 <el-input v-if="scope.row.type==='topic'"
                           class="num_input"
-                          v-model="scope.row.liuzhaunbumen"
+                          v-model.trim="scope.row.liuzhaunbumen"
                           label="描述文字"></el-input>
                 <span v-else>{{"--"}}</span>
 
@@ -391,7 +391,7 @@
                              :show-overflow-tooltip="true">
               <template slot-scope="scope">
                 <el-radio-group v-if="scope.row.type==='topic'"
-                                v-model="scope.row.isJiean">
+                                v-model.trim="scope.row.isJiean">
                   <el-radio :label="true">是</el-radio>
                   <el-radio :label="false">否</el-radio>
 
@@ -409,7 +409,7 @@
                              :show-overflow-tooltip="true">
               <template slot-scope="scope">
                 <el-radio-group v-if="scope.row.type==='topic'"
-                                v-model="scope.row.isTuihui">
+                                v-model.trim="scope.row.isTuihui">
                   <el-radio :label="true">是</el-radio>
                   <el-radio :label="false">否</el-radio>
 
@@ -426,7 +426,7 @@
                              :show-overflow-tooltip="true">
               <template slot-scope="scope">
                 <el-radio-group v-if="scope.row.type==='topic'"
-                                v-model="scope.row.isGuanbi">
+                                v-model.trim="scope.row.isGuanbi">
                   <el-radio :label="true">是</el-radio>
                   <el-radio :label="false">否</el-radio>
 
@@ -506,7 +506,7 @@
             <span class="span_title">小组名称：</span>
             <span class="span_content">{{item.name}}</span>
             <span class="span_title">组长：</span>
-            <el-select v-model="item.leader">
+            <el-select v-model.trim="item.leader">
               <el-option v-for="party in selRow.partyList"
                          :key="party.name"
                          :label="party.name"
@@ -525,7 +525,7 @@
             <span class="span_title">小组名称：</span>
             <span class="span_content">{{item.name}}</span>
             <span class="span_title">组长：</span>
-            <el-select v-model="item.leader">
+            <el-select v-model.trim="item.leader">
               <el-option v-for="party in selRow.hotResiList"
                          :key="party.name"
                          :label="party.name"
diff --git a/src/views/modules/productConfig/customizeFunction/CustomFun.vue b/src/views/modules/productConfig/customizeFunction/CustomFun.vue
index 05e7651c0..7bc7b38c0 100644
--- a/src/views/modules/productConfig/customizeFunction/CustomFun.vue
+++ b/src/views/modules/productConfig/customizeFunction/CustomFun.vue
@@ -7,14 +7,14 @@
         <el-form :inline="true"
                  :model="tableParams">
           <el-form-item>
-            <el-input v-model="tableParams.customizedName"
+            <el-input v-model.trim="tableParams.customizedName"
                       placeholder="功能名称"
                       clearable>
 
             </el-input>
           </el-form-item>
           <el-form-item>
-            <el-select v-model="tableParams.fromApp"
+            <el-select v-model.trim="tableParams.fromApp"
                        placeholder="来源"
                        clearable>
               <el-option v-for="item in form.data['fromApp']"
diff --git a/src/views/modules/productConfig/customizeFunction/Edit.vue b/src/views/modules/productConfig/customizeFunction/Edit.vue
index b2d2cd2d0..5d185aee3 100644
--- a/src/views/modules/productConfig/customizeFunction/Edit.vue
+++ b/src/views/modules/productConfig/customizeFunction/Edit.vue
@@ -20,7 +20,7 @@
           <el-input class="item_width_1"
                     :maxlength="5"
                     :minlength="2"
-                    v-model="dataForm.functionName"
+                    v-model.trim="dataForm.functionName"
                     placeholder="功能名称"></el-input>
         </el-tooltip>
 
@@ -31,7 +31,7 @@
                     prop="fromApp">
         <el-select :disabled="isApply===1"
                    class="item_width_1"
-                   v-model="dataForm.fromApp"
+                   v-model.trim="dataForm.fromApp"
                    placeholder="请选择"
                    clearable>
           <el-option v-for="item in fromAppList"
@@ -45,7 +45,7 @@
                     prop="shoppingStatus">
         <el-select class="item_width_1"
                    :disabled="isApply===1"
-                   v-model="dataForm.shoppingStatus"
+                   v-model.trim="dataForm.shoppingStatus"
                    placeholder="请选择"
                    clearable>
           <el-option v-for="item in shoppingStatusList"
@@ -59,7 +59,7 @@
                     prop="targetLink">
         <el-input v-if="isApply===0"
                   class="item_width_1"
-                  v-model="dataForm.targetLink"
+                  v-model.trim="dataForm.targetLink"
                   placeholder="外链地址"></el-input>
         <span v-else
               style="width:300px;display:block;margin-bottom:10px; float:left">{{dataForm.targetLink}} </span>
@@ -101,7 +101,7 @@
                     class="block"
                     label="是否需要业务域名">
 
-        <el-checkbox v-model="isDomainNameCheck"></el-checkbox>
+        <el-checkbox v-model.trim="isDomainNameCheck"></el-checkbox>
       </el-form-item>
 
       <el-form-item v-if="isDomainNameCheck"
@@ -109,7 +109,7 @@
                     prop="domainName">
         <el-input v-if="isApply===0"
                   class="item_width_1"
-                  v-model="dataForm.domainName"
+                  v-model.trim="dataForm.domainName"
                   placeholder="业务域名"></el-input>
         <span v-else
               style="width:300px;display:block;margin-bottom:10px; float:left">{{dataForm.domainName}} </span>
@@ -119,7 +119,7 @@
                     label="功能说明"
                     prop="functionExplain">
         <el-input class="item_width_2"
-                  v-model="dataForm.functionExplain"
+                  v-model.trim="dataForm.functionExplain"
                   placeholder="功能说明"
                   type="textarea"></el-input>
       </el-form-item>
diff --git a/src/views/modules/productConfig/customizeFunction/EditDomainNameList.vue b/src/views/modules/productConfig/customizeFunction/EditDomainNameList.vue
index cbf35403f..b12aa95c6 100644
--- a/src/views/modules/productConfig/customizeFunction/EditDomainNameList.vue
+++ b/src/views/modules/productConfig/customizeFunction/EditDomainNameList.vue
@@ -20,7 +20,7 @@
           <el-input class="item_width_1"
                     :maxlength="5"
                     :minlength="2"
-                    v-model="dataForm.functionName"
+                    v-model.trim="dataForm.functionName"
                     placeholder="功能名称"></el-input>
         </el-tooltip>
 
@@ -31,7 +31,7 @@
                     prop="fromApp">
         <el-select :disabled="isApply===1"
                    class="item_width_1"
-                   v-model="dataForm.fromApp"
+                   v-model.trim="dataForm.fromApp"
                    placeholder="请选择"
                    clearable>
           <el-option v-for="item in fromAppList"
@@ -45,7 +45,7 @@
                     prop="shoppingStatus">
         <el-select class="item_width_1"
                    :disabled="isApply===1"
-                   v-model="dataForm.shoppingStatus"
+                   v-model.trim="dataForm.shoppingStatus"
                    placeholder="请选择"
                    clearable>
           <el-option v-for="item in shoppingStatusList"
@@ -59,7 +59,7 @@
                     prop="targetLink">
         <el-input v-if="isApply===0"
                   class="item_width_1"
-                  v-model="dataForm.targetLink"
+                  v-model.trim="dataForm.targetLink"
                   placeholder="外链地址"></el-input>
         <span v-else
               style="width:300px;display:block;margin-bottom:10px; float:left">{{dataForm.targetLink}} </span>
@@ -101,7 +101,7 @@
                     class="block"
                     label="是否需要业务域名">
 
-        <el-checkbox v-model="isDomainNameCheck"></el-checkbox>
+        <el-checkbox v-model.trim="isDomainNameCheck"></el-checkbox>
       </el-form-item>
 
       <el-form-item v-if="isDomainNameCheck"
@@ -114,7 +114,7 @@
             <el-input :disabled="isApply===1"
                       style="width:300px;display:block;margin-bottom:10px; float:left"
                       placeholder='请输入业务域名'
-                      v-model="domainNameList[index]"> </el-input>
+                      v-model.trim="domainNameList[index]"> </el-input>
 
             <el-button v-if="index===0"
                        size="mini"
@@ -147,7 +147,7 @@
                     label="功能说明"
                     prop="functionExplain">
         <el-input class="item_width_2"
-                  v-model="dataForm.functionExplain"
+                  v-model.trim="dataForm.functionExplain"
                   placeholder="功能说明"
                   type="textarea"></el-input>
       </el-form-item>
diff --git a/src/views/modules/productConfig/defaultFunction/CustomizedFunction copy.vue b/src/views/modules/productConfig/defaultFunction/CustomizedFunction copy.vue
index 7456c8b68..f1f754c59 100644
--- a/src/views/modules/productConfig/defaultFunction/CustomizedFunction copy.vue	
+++ b/src/views/modules/productConfig/defaultFunction/CustomizedFunction copy.vue	
@@ -6,13 +6,13 @@
                :model="dataForm"
                @keyup.enter.native="getDataList()">
         <el-form-item label="功能名称">
-          <el-input v-model="dataForm.functionName"
+          <el-input v-model.trim="dataForm.functionName"
                     :placeholder="$t('params.paramCode')"
                     clearable></el-input>
         </el-form-item>
 
         <el-form-item label="上架状态">
-          <el-select v-model="dataForm.shoppingStatus"
+          <el-select v-model.trim="dataForm.shoppingStatus"
                      placeholder="全部"
                      clearable>
             <el-option v-for="item in shoppingStatusList"
diff --git a/src/views/modules/productConfig/defaultFunction/function-add-or-update.vue b/src/views/modules/productConfig/defaultFunction/function-add-or-update.vue
index e969ce4d0..1d7c8e56a 100644
--- a/src/views/modules/productConfig/defaultFunction/function-add-or-update.vue
+++ b/src/views/modules/productConfig/defaultFunction/function-add-or-update.vue
@@ -10,12 +10,12 @@
              :label-width="$i18n.locale === 'en-US' ? '120px' : '120px'">
       <el-form-item label="功能名称"
                     prop="functionName">
-        <el-input v-model="dataForm.functionName"
+        <el-input v-model.trim="dataForm.functionName"
                   placeholder="功能名称"></el-input>
       </el-form-item>
       <!-- <el-form-item label="功能类型"
                     prop="functionGroup">
-        <el-select v-model="dataForm.functionGroup"
+        <el-select v-model.trim="dataForm.functionGroup"
                    placeholder="请选择"
                    clearable>
           <el-option v-for="item in functionGroupList"
@@ -41,7 +41,7 @@
       </el-form-item>
       <el-form-item label="上架状态"
                     prop="shoppingStatus">
-        <el-select v-model="dataForm.shoppingStatus"
+        <el-select v-model.trim="dataForm.shoppingStatus"
                    placeholder="请选择"
                    clearable>
           <el-option v-for="item in shoppingStatusList"
@@ -54,7 +54,7 @@
 
       <el-form-item label="功能说明"
                     prop="functionExplain">
-        <el-input v-model="dataForm.functionExplain"
+        <el-input v-model.trim="dataForm.functionExplain"
                   placeholder="功能说明"
                   type="textarea"></el-input>
       </el-form-item>
diff --git a/src/views/modules/productConfig/defaultFunction/function.vue b/src/views/modules/productConfig/defaultFunction/function.vue
index 55a07eb5f..e1c0af4b3 100644
--- a/src/views/modules/productConfig/defaultFunction/function.vue
+++ b/src/views/modules/productConfig/defaultFunction/function.vue
@@ -6,12 +6,12 @@
                :model="dataForm"
                @keyup.enter.native="getDataList()">
         <el-form-item label="功能名称">
-          <el-input v-model="dataForm.functionName"
+          <el-input v-model.trim="dataForm.functionName"
                     :placeholder="'功能名称'"
                     clearable></el-input>
         </el-form-item>
         <!-- <el-form-item label="功能类型">
-          <el-select v-model="dataForm.functionGroup"
+          <el-select v-model.trim="dataForm.functionGroup"
                      placeholder="全部"
                      clearable>
             <el-option v-for="item in functionGroupList"
@@ -22,7 +22,7 @@
           </el-select>
         </el-form-item> -->
         <el-form-item label="上架状态">
-          <el-select v-model="dataForm.shoppingStatus"
+          <el-select v-model.trim="dataForm.shoppingStatus"
                      placeholder="全部"
                      clearable>
             <el-option v-for="item in shoppingStatusList"
diff --git a/src/views/modules/productConfig/footbar/FootbarEdit.vue b/src/views/modules/productConfig/footbar/FootbarEdit.vue
index b37620721..f22f65eac 100644
--- a/src/views/modules/productConfig/footbar/FootbarEdit.vue
+++ b/src/views/modules/productConfig/footbar/FootbarEdit.vue
@@ -17,7 +17,7 @@
 
         <el-input :disabled="type==='U'"
                   class="item_width_1"
-                  v-model="dataForm.barKey"
+                  v-model.trim="dataForm.barKey"
                   placeholder="Key"></el-input>
 
       </el-form-item>
@@ -36,7 +36,7 @@
           <el-input class="item_width_1"
                     :maxlength="5"
                     :minlength="2"
-                    v-model="dataForm.barName"
+                    v-model.trim="dataForm.barName"
                     placeholder="导航栏名称"></el-input>
         </el-tooltip>
       </el-form-item>
@@ -55,7 +55,7 @@
           <el-input class="item_width_1"
                     :maxlength="10"
                     :minlength="2"
-                    v-model="dataForm.pageTitle"
+                    v-model.trim="dataForm.pageTitle"
                     placeholder="页面标题"></el-input>
         </el-tooltip>
       </el-form-item>
@@ -65,7 +65,7 @@
                     prop="appType">
         <el-select :disabled="type==='U'"
                    class="item_width_1"
-                   v-model="dataForm.appType"
+                   v-model.trim="dataForm.appType"
                    placeholder="请选择"
                    clearable>
           <el-option v-for="item in fromAppList"
diff --git a/src/views/modules/productConfig/footbar/FootbarList.vue b/src/views/modules/productConfig/footbar/FootbarList.vue
index 4e0e73b62..2b0a1edc4 100644
--- a/src/views/modules/productConfig/footbar/FootbarList.vue
+++ b/src/views/modules/productConfig/footbar/FootbarList.vue
@@ -25,7 +25,7 @@
                  @click="addShow">新增</el-button>
 
     </div>
-    <el-tabs v-model="activeName"
+    <el-tabs v-model.trim="activeName"
              @tab-click="tabClick"
              class="el-tabs">
       <el-tab-pane label="居民端"
diff --git a/src/views/modules/productConfig/footbar/FootbarMode.vue b/src/views/modules/productConfig/footbar/FootbarMode.vue
index be5dbaa29..832442731 100644
--- a/src/views/modules/productConfig/footbar/FootbarMode.vue
+++ b/src/views/modules/productConfig/footbar/FootbarMode.vue
@@ -4,9 +4,9 @@
     <div>
       <span>显示模式：</span>
       <div class="div_radio">
-        <el-radio v-model="mode"
+        <el-radio v-model.trim="mode"
                   label="flat">模式1</el-radio>
-        <el-radio v-model="mode"
+        <el-radio v-model.trim="mode"
                   @change="changeToMode2"
                   label="float">模式2（非隐藏标签总数为奇数时可选择）</el-radio>
         <el-button size="mini"
diff --git a/src/views/modules/productConfig/homeComponent/functionconfiguration.vue b/src/views/modules/productConfig/homeComponent/functionconfiguration.vue
index c1ca31360..0bc8df35f 100644
--- a/src/views/modules/productConfig/homeComponent/functionconfiguration.vue
+++ b/src/views/modules/productConfig/homeComponent/functionconfiguration.vue
@@ -4,7 +4,7 @@
     <div class="mod-/oper/customize__homecomponent}">
       <el-form :inline="true">
         <el-form-item>
-          <el-input v-model="ruleForm.name"
+          <el-input v-model.trim="ruleForm.name"
                     placeholder="请输入客户名称"
                     clearable="true"></el-input>
         </el-form-item>
diff --git a/src/views/modules/productConfig/homeComponent/homecomponent-add-or-update.vue b/src/views/modules/productConfig/homeComponent/homecomponent-add-or-update.vue
index fcc1e26fa..54df629ee 100644
--- a/src/views/modules/productConfig/homeComponent/homecomponent-add-or-update.vue
+++ b/src/views/modules/productConfig/homeComponent/homecomponent-add-or-update.vue
@@ -11,7 +11,7 @@
       <el-form-item label="功能"
                     prop="functionId"
                     v-if="true">
-        <el-select v-model="dataForm.functionId"
+        <el-select v-model.trim="dataForm.functionId"
                    placeholder="请选择"
                    clearable>
           <el-option v-for="item in functionList"
@@ -23,17 +23,17 @@
       </el-form-item>
       <el-form-item label="组件名称"
                     prop="componentName">
-        <el-input v-model="dataForm.componentName"
+        <el-input v-model.trim="dataForm.componentName"
                   placeholder="组件名称"></el-input>
       </el-form-item>
       <el-form-item label="组件前端标识"
                     prop="componentFrontId">
-        <el-input v-model="dataForm.componentFrontId"
+        <el-input v-model.trim="dataForm.componentFrontId"
                   placeholder="例如:gov-titleList-home-gridNameTitle"></el-input>
       </el-form-item>
       <el-form-item label="所属端"
                     prop="clientType">
-        <el-select v-model="dataForm.clientType"
+        <el-select v-model.trim="dataForm.clientType"
                    placeholder="请选择"
                    clearable>
           <el-option v-for="item in clientTypeList"
@@ -45,7 +45,7 @@
       </el-form-item>
       <el-form-item label="组件类型"
                     prop="conponentType">
-        <el-select v-model="dataForm.conponentType"
+        <el-select v-model.trim="dataForm.conponentType"
                    placeholder="请选择"
                    clearable>
           <el-option v-for="item in conponentTypeList"
@@ -57,7 +57,7 @@
       </el-form-item>
       <el-form-item label="组件的适用区域"
                     prop="region">
-        <el-select v-model="dataForm.region"
+        <el-select v-model.trim="dataForm.region"
                    placeholder="请选择"
                    clearable>
           <el-option v-for="item in regionList"
@@ -69,19 +69,19 @@
       </el-form-item>
       <el-form-item label="高级配置"
                     prop="configuration">
-        <el-input v-model="dataForm.configuration"
+        <el-input v-model.trim="dataForm.configuration"
                   placeholder="高级配置"
                   type="textarea"></el-input>
       </el-form-item>
       <el-form-item label="配置项说明"
                     prop="configurationDescription">
-        <el-input v-model="dataForm.configurationDescription"
+        <el-input v-model.trim="dataForm.configurationDescription"
                   placeholder="配置项说明"
                   type="textarea"></el-input>
       </el-form-item>
       <el-form-item label="演示数据"
                     prop="demoData">
-        <el-input v-model="dataForm.demoData"
+        <el-input v-model.trim="dataForm.demoData"
                   placeholder="演示数据"
                   type="textarea"></el-input>
       </el-form-item>
diff --git a/src/views/modules/productConfig/homeComponent/homecomponent.vue b/src/views/modules/productConfig/homeComponent/homecomponent.vue
index 93e0acebd..aa1c1f9cb 100644
--- a/src/views/modules/productConfig/homeComponent/homecomponent.vue
+++ b/src/views/modules/productConfig/homeComponent/homecomponent.vue
@@ -6,12 +6,12 @@
                :model="dataForm"
                @keyup.enter.native="getDataList()">
         <el-form-item label="组件名称">
-          <el-input v-model="dataForm.componentName"
+          <el-input v-model.trim="dataForm.componentName"
                     placeholder="请输入组件名称模糊匹配"
                     clearable></el-input>
         </el-form-item>
         <el-form-item label="所属端">
-          <el-select v-model="dataForm.clientType"
+          <el-select v-model.trim="dataForm.clientType"
                      placeholder="全部"
                      clearable>
             <el-option v-for="item in clientTypeList"
@@ -22,7 +22,7 @@
           </el-select>
         </el-form-item>
         <el-form-item label="组件类型">
-          <el-select v-model="dataForm.conponentType"
+          <el-select v-model.trim="dataForm.conponentType"
                      placeholder="全部"
                      clearable>
             <el-option v-for="item in conponentTypeList"
@@ -33,7 +33,7 @@
           </el-select>
         </el-form-item>
         <el-form-item label="组件适用区域">
-          <el-select v-model="dataForm.region"
+          <el-select v-model.trim="dataForm.region"
                      placeholder="全部"
                      clearable>
             <el-option v-for="item in regionList"
@@ -45,7 +45,7 @@
         </el-form-item>
         <br>
         <el-form-item label="所属功能">
-          <el-select v-model="dataForm.functionId"
+          <el-select v-model.trim="dataForm.functionId"
                      placeholder="全部"
                      clearable>
             <el-option v-for="item in functionList"
diff --git a/src/views/modules/productConfig/homeCustom/homepage.vue b/src/views/modules/productConfig/homeCustom/homepage.vue
index 36c4350e4..718f8f9e3 100644
--- a/src/views/modules/productConfig/homeCustom/homepage.vue
+++ b/src/views/modules/productConfig/homeCustom/homepage.vue
@@ -160,7 +160,7 @@
                        ref="form">
                 <el-form-item>
                   <el-input type="textarea"
-                            v-model="focusedCpt.demoData"></el-input>
+                            v-model.trim="focusedCpt.demoData"></el-input>
                 </el-form-item>
               </el-form> -->
 
@@ -176,7 +176,7 @@
               <el-form ref="form">
                 <el-form-item>
                   <el-input type="textarea"
-                            v-model="focusedCpt.configuration"></el-input>
+                            v-model.trim="focusedCpt.configuration"></el-input>
                 </el-form-item>
                 <div class="d-config-hint"
                      v-show="focusedCpt.configurationDescription">
diff --git a/src/views/modules/productConfig/mostedit/MostList.vue b/src/views/modules/productConfig/mostedit/MostList.vue
index 264e5c0a7..69883144a 100644
--- a/src/views/modules/productConfig/mostedit/MostList.vue
+++ b/src/views/modules/productConfig/mostedit/MostList.vue
@@ -14,7 +14,7 @@
     <div class="mh-child">
       <el-tag class="set-overtime">项目外部系统流转：</el-tag>
       <el-switch
-        v-model="sendProjectSwitch"
+        v-model.trim="sendProjectSwitch"
         active-text="开启"
         inactive-text="关闭"
         element
@@ -35,7 +35,7 @@
     </div>
     <div class="mh-child">
       <el-tag class="set-overtime">外部系统：</el-tag>
-      <el-select v-model="selectSys" multiple placeholder="请选择" @change="handleSys" class="overtime-input">
+      <el-select v-model.trim="selectSys" multiple placeholder="请选择" @change="handleSys" class="overtime-input">
         <el-option
           v-for="item in sysList"
           :key="item.platformId"
@@ -70,7 +70,7 @@
         class="overtime-input"
         arrow-control
         prefix-icon="el-icon-date"
-        v-model="startTime"
+        v-model.trim="startTime"
         :picker-options="{
           selectableRange: '00:00:00' + '-' + '23:59:59'
         }"
@@ -83,7 +83,7 @@
         class="overtime-input"
         arrow-control
         prefix-icon="el-icon-date"
-        v-model="endTime"
+        v-model.trim="endTime"
         :picker-options="{
           selectableRange: startTime + '-' + '23:59:59'
         }"
@@ -96,7 +96,7 @@
     <div class="mh-child">
       <el-tag class="set-overtime">设定滞留超期时间：</el-tag>
           <button class="btn btn-delet" @click="staytime_subtract()">-</button>
-        <el-input class="overtime-input" v-model="detentionDays"></el-input>
+        <el-input class="overtime-input" v-model.trim="detentionDays"></el-input>
           <button class="btn btn-add" @click="staytime_add()">+</button>
         <el-tag
           style="
@@ -109,7 +109,7 @@
           "
           >/</el-tag
         >
-        <el-select v-model="value" placeholder="请选择" class="overtime-input">
+        <el-select v-model.trim="value" placeholder="请选择" class="overtime-input">
           <el-option
             v-for="item in options"
             :key="item.value"
@@ -124,7 +124,7 @@
     <div class="mh-child">
       <el-tag class="set-overtime">设定即将超期时间提醒：</el-tag>
           <button class="btn btn-delet" @click="subtract_remind()">-</button>
-          <el-input class="overtime-input" v-model="remindTime"></el-input>
+          <el-input class="overtime-input" v-model.trim="remindTime"></el-input>
           <button class="btn btn-add" @click="add_remind()">+</button>
       <el-tag
         style="
@@ -140,7 +140,7 @@
       <el-tag class="set-overtime">统一定时消息推送时间：</el-tag>
       <el-time-select
         class="overtime-input"
-        v-model="pushTime"
+        v-model.trim="pushTime"
         :picker-options="{
           start: '06:00',
           step: '00:05',
@@ -165,7 +165,7 @@
     <div class="mh-child">
       <el-tag class="set-overtime">议题发布前经网络员审核：</el-tag>
       <el-switch
-        v-model="button1"
+        v-model.trim="button1"
         active-text="开启"
         inactive-text="关闭"
         element
@@ -186,7 +186,7 @@
     <!-- 代办事项发送短信通知 -->
     <div class="mh-child">
       <el-tag class="set-overtime">待办事项发送短信通知：</el-tag>
-      <el-switch v-model="button2" active-text="开启" inactive-text="关闭">
+      <el-switch v-model.trim="button2" active-text="开启" inactive-text="关闭">
       </el-switch>
     </div>
     <!-- 剩余短信数量-->
@@ -194,7 +194,7 @@
       <el-tag class="set-overtime">剩余短信数量：</el-tag>
       <el-input
         placeholder="请输入内容"
-        v-model="input"
+        v-model.trim="input"
         clearable
         class="overtime-input"
       >
@@ -221,7 +221,7 @@
     <!-- 新建小组进组需小组审核-->
     <div class="mh-child">
       <el-tag class="set-overtime">新建小组进组需小组审核：</el-tag>
-      <el-switch v-model="button3" active-text="开启" inactive-text="关闭">
+      <el-switch v-model.trim="button3" active-text="开启" inactive-text="关闭">
       </el-switch>
     </div>
     <!-- 其他设置-->
diff --git a/src/views/modules/productConfig/subscribe/MyTemp.vue b/src/views/modules/productConfig/subscribe/MyTemp.vue
index 734487eef..52d477c07 100644
--- a/src/views/modules/productConfig/subscribe/MyTemp.vue
+++ b/src/views/modules/productConfig/subscribe/MyTemp.vue
@@ -5,7 +5,7 @@
              class="aui-card--fill">
 
       <el-radio-group @change="radioChange"
-                      v-model="activeName">
+                      v-model.trim="activeName">
         <el-radio-button label="resi">居民端</el-radio-button>
         <el-radio-button label="gov">工作端</el-radio-button>
 
diff --git a/src/views/modules/productConfig/subscribe/TempEdit.vue b/src/views/modules/productConfig/subscribe/TempEdit.vue
index 1b1d46348..90c0dd830 100644
--- a/src/views/modules/productConfig/subscribe/TempEdit.vue
+++ b/src/views/modules/productConfig/subscribe/TempEdit.vue
@@ -48,13 +48,13 @@
 
               <el-form-item label=""
                             prop="isSync">
-                <el-checkbox v-model="dataForm.isSync">同步到所有客户</el-checkbox>
+                <el-checkbox v-model.trim="dataForm.isSync">同步到所有客户</el-checkbox>
               </el-form-item>
 
               <el-form-item label="App类型"
                             prop="appId">
                 <el-select class="item_width_1"
-                           v-model="dataForm.appId"
+                           v-model.trim="dataForm.appId"
                            placeholder="请选择"
                            clearable>
                   <el-option v-for="item in fromAppList"
@@ -67,7 +67,7 @@
 
               <el-form-item label="配置关键字">
                 <div class="item_width_1 div_keywords">
-                  <el-checkbox-group v-model="kidSelNameList"
+                  <el-checkbox-group v-model.trim="kidSelNameList"
                                      :min="1"
                                      :max="5">
                     <div class="item_width_1 div_checkbox"
@@ -102,7 +102,7 @@
                 <el-input class="item_width_1"
                           :maxlength="5"
                           :minlength="2"
-                          v-model="dataForm.sceneDesc"
+                          v-model.trim="dataForm.sceneDesc"
                           placeholder="服务场景描述"></el-input>
 
               </el-form-item>
diff --git a/src/views/modules/productConfig/subscribe/TempList.vue b/src/views/modules/productConfig/subscribe/TempList.vue
index 4f187a415..13a50e30b 100644
--- a/src/views/modules/productConfig/subscribe/TempList.vue
+++ b/src/views/modules/productConfig/subscribe/TempList.vue
@@ -3,7 +3,7 @@
 
     <el-card shadow="never"
              class="aui-card--fill">
-      <el-tabs v-model="activeName"
+      <el-tabs v-model.trim="activeName"
                @tab-click="tabClick"
                class="el-tabs">
         <el-tab-pane label="我的模板"
@@ -16,14 +16,14 @@
                    :model="tableParams">
 
             <el-form-item>
-              <el-input v-model="tableParams.title"
+              <el-input v-model.trim="tableParams.title"
                         placeholder="标题"
                         clearable>
 
               </el-input>
             </el-form-item>
             <el-form-item>
-              <el-select v-model="tableParams.ids"
+              <el-select v-model.trim="tableParams.ids"
                          placeholder="类目"
                          clearable>
                 <el-option v-for="item in categoryList"
diff --git a/src/views/modules/productConfig/topicConfig/TopicConfig copy.vue b/src/views/modules/productConfig/topicConfig/TopicConfig copy.vue
index 088eb04d3..03b47f542 100644
--- a/src/views/modules/productConfig/topicConfig/TopicConfig copy.vue	
+++ b/src/views/modules/productConfig/topicConfig/TopicConfig copy.vue	
@@ -25,7 +25,7 @@
                       placeholder='请输入话题内容'
                       maxlength="100"
                       show-word-limit
-                      v-model="dataList[0].content">
+                      v-model.trim="dataList[0].content">
             </el-input>
           </el-col>
           <el-col :span="8">
@@ -35,7 +35,7 @@
               <span>{{"评论"+(index+1)+"："}}</span>
               <el-input style="width:85%"
                         placeholder='请输入评论1'
-                        v-model="item.content">
+                        v-model.trim="item.content">
               </el-input>
             </div>
           </el-col>
@@ -43,7 +43,7 @@
           <el-col :span="7">
             <div class="topic_item_title">是否转议题：
               <el-radio-group @change="handleIsDiscussChange"
-                              v-model="dataList[0].toDiscuss">
+                              v-model.trim="dataList[0].toDiscuss">
                 <el-radio label="1">转</el-radio>
                 <el-radio label="2">不转</el-radio>
               </el-radio-group>
@@ -51,7 +51,7 @@
             <div class="topic_item_title">标题：
               <el-input style="width:85%"
                         placeholder='请输入标题'
-                        v-model="dataList[0].discuss.title">
+                        v-model.trim="dataList[0].discuss.title">
               </el-input>
             </div>
             <div class="topic_item_title">建议：
@@ -62,11 +62,11 @@
                         placeholder='请输入话题内容'
                         maxlength="50"
                         show-word-limit
-                        v-model="dataList[0].discuss.suggest">
+                        v-model.trim="dataList[0].discuss.suggest">
               </el-input>
             </div>
             <div class="topic_item_title">支持人数：
-              <el-input-number v-model="dataList[0].discuss.support"
+              <el-input-number v-model.trim="dataList[0].discuss.support"
                                size="mini"
                                @change="handleSupportChange"
                                :min="1"
@@ -74,7 +74,7 @@
                                label="支持人数"></el-input-number>
             </div>
             <div class="topic_item_title">反对人数：
-              <el-input-number v-model="dataList[0].discuss.oppose"
+              <el-input-number v-model.trim="dataList[0].discuss.oppose"
                                @change="handleOpposeChange"
                                :min="1"
                                :max="3"
@@ -87,7 +87,7 @@
           <el-col :span="7">
             <div class="topic_item_title">是否转项目：
               <el-radio-group @change="handleIsDiscussChange"
-                              v-model="dataList[0].toProject">
+                              v-model.trim="dataList[0].toProject">
                 <el-radio label="1">转</el-radio>
                 <el-radio label="2">不转</el-radio>
               </el-radio-group>
@@ -95,7 +95,7 @@
             <div class="topic_item_title">标题：
               <el-input style="width:85%"
                         placeholder='请输入标题'
-                        v-model="dataList[0].discuss.title">
+                        v-model.trim="dataList[0].discuss.title">
               </el-input>
             </div>
             <div class="topic_item_title">建议：
@@ -106,18 +106,18 @@
                         placeholder='请输入话题内容'
                         maxlength="50"
                         show-word-limit
-                        v-model="dataList[0].discuss.suggest">
+                        v-model.trim="dataList[0].discuss.suggest">
               </el-input>
             </div>
             <div class="topic_item_title">支持人数：
-              <el-input-number v-model="dataList[0].discuss.support"
+              <el-input-number v-model.trim="dataList[0].discuss.support"
                                @change="handleSupportChange"
                                :min="1"
                                :max="3"
                                label="支持人数"></el-input-number>
             </div>
             <div class="topic_item_title">反对人数：
-              <el-input-number v-model="dataList[0].discuss.oppose"
+              <el-input-number v-model.trim="dataList[0].discuss.oppose"
                                @change="handleOpposeChange"
                                :min="1"
                                :max="3"
diff --git a/src/views/modules/productConfig/topicConfig/TopicConfig.vue b/src/views/modules/productConfig/topicConfig/TopicConfig.vue
index 21cccac86..b840a7d6c 100644
--- a/src/views/modules/productConfig/topicConfig/TopicConfig.vue
+++ b/src/views/modules/productConfig/topicConfig/TopicConfig.vue
@@ -2,7 +2,7 @@
   <div class="main_div">
 
     <div>
-      <el-tabs v-model="activeName"
+      <el-tabs v-model.trim="activeName"
                @tab-click="tabChange"
                class="el-tabs"
                :style="{height:tableHeight,overflowY:'hidden',overflowX:'hidden'}">
@@ -25,7 +25,7 @@
                           placeholder='请输入话题内容'
                           maxlength="150"
                           show-word-limit
-                          v-model="topicForm.content"> </el-input>
+                          v-model.trim="topicForm.content"> </el-input>
               </el-form-item>
 
               <el-form-item v-for="(item,index) in topicForm.commentList"
@@ -35,14 +35,14 @@
 
                 <el-input style="width:85%"
                           placeholder='请输入评论1'
-                          v-model="item.content">
+                          v-model.trim="item.content">
                 </el-input>
               </el-form-item>
 
               <el-form-item label="是否关闭话题"
                             label-width="150px">
                 <el-radio-group @change="handleIsTopicClose"
-                                v-model="topicForm.isTopciClose">
+                                v-model.trim="topicForm.isTopciClose">
                   <el-radio label="1">不关闭</el-radio>
                   <el-radio label="2">无需解决关闭</el-radio>
                   <el-radio label="3">解决关闭</el-radio>
@@ -54,7 +54,7 @@
                             label-width="150px">
                 <el-input placeholder='请输入话题内容'
                           style="width:85%"
-                          v-model="topicForm.topciCloseReason"> </el-input>
+                          v-model.trim="topicForm.topciCloseReason"> </el-input>
               </el-form-item>
             </el-form>
           </div>
@@ -71,7 +71,7 @@
                             label-width="150px">
                 <el-radio-group @change="handleIsDiscussChange"
                                 :disabled="suggestDisable"
-                                v-model="suggestForm.isToDiscuss">
+                                v-model.trim="suggestForm.isToDiscuss">
                   <el-radio label="1">转</el-radio>
                   <el-radio label="2">不转</el-radio>
                 </el-radio-group>
@@ -81,7 +81,7 @@
                               label-width="150px">
                   <el-input style="width:85%"
                             placeholder='请输入标题'
-                            v-model="suggestForm.title">
+                            v-model.trim="suggestForm.title">
                   </el-input>
                 </el-form-item>
                 <el-form-item label="议题建议"
@@ -93,13 +93,13 @@
                             placeholder='请输入话题内容'
                             maxlength="100"
                             show-word-limit
-                            v-model="suggestForm.suggest">
+                            v-model.trim="suggestForm.suggest">
                   </el-input>
                 </el-form-item>
                 <el-form-item label="支持人数"
                               label-width="150px"
                               style="width:30%;display:inline-block;">
-                  <el-input-number v-model="suggestForm.support"
+                  <el-input-number v-model.trim="suggestForm.support"
                                    size="mini"
                                    @change="handleSupportChange"
                                    :min="1"
@@ -109,7 +109,7 @@
                 <el-form-item label="反对人数"
                               label-width="150px"
                               style="width:30%;display:inline-block;">
-                  <el-input-number v-model="suggestForm.oppose"
+                  <el-input-number v-model.trim="suggestForm.oppose"
                                    @change="handleOpposeChange"
                                    :min="1"
                                    :max="3"
@@ -120,7 +120,7 @@
                 <el-form-item label="是否关闭议题"
                               label-width="150px">
                   <el-radio-group @change="handleIsDiscussClose"
-                                  v-model="suggestForm.isSuggestClose">
+                                  v-model.trim="suggestForm.isSuggestClose">
                     <el-radio label="1">不关闭</el-radio>
                     <el-radio label="2">无需解决关闭</el-radio>
                     <el-radio label="3">解决关闭</el-radio>
@@ -130,7 +130,7 @@
                               label="议题关闭理由"
                               label-width="150px">
                   <el-input placeholder='请输入话题内容'
-                            v-model="suggestForm.suggestCloseReason"> </el-input>
+                            v-model.trim="suggestForm.suggestCloseReason"> </el-input>
                 </el-form-item>
               </div>
             </el-form>
@@ -149,7 +149,7 @@
                             label-width="150px">
                 <el-radio-group @change="handleIsProjectChange"
                                 :disabled="projectDiasbled"
-                                v-model="projectForm.isToProject">
+                                v-model.trim="projectForm.isToProject">
                   <el-radio label="1">转</el-radio>
                   <el-radio label="2">不转</el-radio>
                 </el-radio-group>
@@ -163,20 +163,20 @@
                 <el-form-item label="公开答复"
                               label-width="150px">
                   <el-input placeholder='请输入公开答复'
-                            v-model="projectForm.localLevel.answer"> </el-input>
+                            v-model.trim="projectForm.localLevel.answer"> </el-input>
 
                 </el-form-item>
 
                 <el-form-item label="内部回复"
                               label-width="150px">
                   <el-input placeholder='请输入内部回复'
-                            v-model="projectForm.localLevel.reply"> </el-input>
+                            v-model.trim="projectForm.localLevel.reply"> </el-input>
 
                 </el-form-item>
 
                 <el-form-item label="是否向社区流转"
                               label-width="150px">
-                  <el-checkbox v-model="projectForm.isToCommunity">是</el-checkbox>
+                  <el-checkbox v-model.trim="projectForm.isToCommunity">是</el-checkbox>
 
                 </el-form-item>
                 <div v-if=" projectForm.isToCommunity">
@@ -187,14 +187,14 @@
                   <el-form-item label="公开答复"
                                 label-width="150px">
                     <el-input placeholder='请输入公开答复'
-                              v-model="projectForm.communityLevel.answer"> </el-input>
+                              v-model.trim="projectForm.communityLevel.answer"> </el-input>
 
                   </el-form-item>
 
                   <el-form-item label="内部回复"
                                 label-width="150px">
                     <el-input placeholder='请输入内部回复'
-                              v-model="projectForm.communityLevel.reply"> </el-input>
+                              v-model.trim="projectForm.communityLevel.reply"> </el-input>
 
                   </el-form-item>
 
@@ -203,7 +203,7 @@
                 <div v-if=" projectForm.isToCommunity">
                   <el-form-item label="是否向街道流转"
                                 label-width="150px">
-                    <el-checkbox v-model="projectForm.isToStreet">是</el-checkbox>
+                    <el-checkbox v-model.trim="projectForm.isToStreet">是</el-checkbox>
 
                   </el-form-item>
                   <div v-if=" projectForm.isToStreet">
@@ -214,14 +214,14 @@
                     <el-form-item label="公开答复"
                                   label-width="150px">
                       <el-input placeholder='请输入公开答复'
-                                v-model="projectForm.streetLevel.answer"> </el-input>
+                                v-model.trim="projectForm.streetLevel.answer"> </el-input>
 
                     </el-form-item>
 
                     <el-form-item label="内部回复"
                                   label-width="150px">
                       <el-input placeholder='请输入内部回复'
-                                v-model="projectForm.streetLevel.reply"> </el-input>
+                                v-model.trim="projectForm.streetLevel.reply"> </el-input>
 
                     </el-form-item>
                   </div>
@@ -230,7 +230,7 @@
                 <el-form-item label="结案说明"
                               label-width="150px">
                   <el-input placeholder='请输入内部回复'
-                            v-model="projectForm.proWork"> </el-input>
+                            v-model.trim="projectForm.proWork"> </el-input>
 
                 </el-form-item>
 
@@ -243,7 +243,7 @@
                        label-width="150px">
 
                     <el-select class="item_width_1"
-                               v-model="item.level"
+                               v-model.trim="item.level"
                                placeholder="请选择"
                                clearable>
                       <el-option v-for="item in levelList"
@@ -255,7 +255,7 @@
 
                     <el-input style="width:65%;margin-left:10px"
                               placeholder='请输入满意度说明'
-                              v-model="item.reason">
+                              v-model.trim="item.reason">
                     </el-input>
                   </div>
                 </el-form-item>
diff --git a/src/views/modules/productConfig/workRoleAuth.vue b/src/views/modules/productConfig/workRoleAuth.vue
index fa7a2f041..52a4f07b2 100644
--- a/src/views/modules/productConfig/workRoleAuth.vue
+++ b/src/views/modules/productConfig/workRoleAuth.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="role-container">
     <el-card class="flex1">
-      <el-tabs v-model="activeName"
+      <el-tabs v-model.trim="activeName"
                @tab-click="tabClick"
                class="el-tabs">
         <el-tab-pane label="工作端"
@@ -29,7 +29,7 @@
                              width="180">
               <template slot-scope="scope">
                 <el-input v-if="scope.row.isEdit"
-                          v-model="scope.row.roleName"
+                          v-model.trim="scope.row.roleName"
                           clearable>
                 </el-input>
                 <span v-else>{{scope.row.constName}}</span>
@@ -97,7 +97,7 @@
            v-if="dutyShow">
         <el-input type="textarea"
                   :rows="8"
-                  v-model="description"></el-input>
+                  v-model.trim="description"></el-input>
         <div class="div_btn">
           <el-button type="primary"
                      size="small"
@@ -163,7 +163,7 @@
               <el-col v-loading="loading3">
                 <el-card shadow="hover">
                   <el-checkbox-group class="t"
-                                     v-model="checkedScopes"
+                                     v-model.trim="checkedScopes"
                                      @change="roleChange">
                     <el-checkbox v-for="scope in scopeOptions"
                                  :label="scope.scopeKey"
diff --git a/src/views/modules/satisfaction/communitySelfInsp/communityDialog.vue b/src/views/modules/satisfaction/communitySelfInsp/communityDialog.vue
index 3d196113b..50f13b4ea 100644
--- a/src/views/modules/satisfaction/communitySelfInsp/communityDialog.vue
+++ b/src/views/modules/satisfaction/communitySelfInsp/communityDialog.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="">
     <el-cascader
-      v-model="formData.agencyId"
+      v-model.trim="formData.agencyId"
       :options="orgOptions"
       :props="{
         value: 'agencyId',
@@ -18,7 +18,7 @@
     />
 
     <el-date-picker
-      v-model="formData.period"
+      v-model.trim="formData.period"
       type="month"
       value-format="yyyy-MM"
       class="cascader"
diff --git a/src/views/modules/satisfaction/communitySelfInsp/followList.vue b/src/views/modules/satisfaction/communitySelfInsp/followList.vue
index 48a26b100..1af951ac8 100644
--- a/src/views/modules/satisfaction/communitySelfInsp/followList.vue
+++ b/src/views/modules/satisfaction/communitySelfInsp/followList.vue
@@ -6,14 +6,14 @@
 					<el-table-column label="序号" type="index" align="center" width="50"></el-table-column>
 					<el-table-column prop="followUpTime" label="回访时间" align="center" width="200px">
 						<template slot-scope="scope">
-							<el-date-picker v-model="scope.row.followUpTime" type="date"
+							<el-date-picker v-model.trim="scope.row.followUpTime" type="date"
 								class="input-width" value-format="yyyy-MM-dd" placeholder="选择日期"  v-if="scope.row.isEdit"></el-date-picker>
 							<div v-else class="div-content">{{ scope.row.followUpTime }}</div>
 						</template>
 					</el-table-column>
                     <el-table-column prop="followUpWay" label="回访方式" align="center">
 						<template slot-scope="scope">
-							<el-select v-model="scope.row.followUpWay" placeholder="请选择"
+							<el-select v-model.trim="scope.row.followUpWay" placeholder="请选择"
 								class="input-width" size="small" clearable  v-if="scope.row.isEdit">
 								<el-option v-for="subItem in followUpWayList" :key="subItem.value" :label="subItem.label"
 									:value="subItem.value"></el-option>
@@ -23,7 +23,7 @@
 					</el-table-column>
                     <el-table-column prop="riskFlag" label="是否风险" align="center">
 						<template slot-scope="scope">
-							<el-select v-model="scope.row.riskFlag" placeholder="请选择"
+							<el-select v-model.trim="scope.row.riskFlag" placeholder="请选择"
 								class="input-width" size="small" clearable  v-if="scope.row.isEdit">
 								<el-option v-for="subItem in binaryOptionList" :key="subItem.value" :label="subItem.label"
 									:value="subItem.value"></el-option>
@@ -33,7 +33,7 @@
 					</el-table-column>
                     <el-table-column prop="description" label="回访详情" align="center" width="200px">
 						<template slot-scope="scope">
-							<el-input  v-if="scope.row.isEdit" v-model="scope.row.description"
+							<el-input  v-if="scope.row.isEdit" v-model.trim="scope.row.description"
 								placeholder="请输入" class="input-width" clearable ></el-input>
 							<div v-else class="div-content">{{ scope.row.description }}</div>
 						</template>
diff --git a/src/views/modules/satisfaction/communitySelfInsp/followUpDetail.vue b/src/views/modules/satisfaction/communitySelfInsp/followUpDetail.vue
index 38f76a664..f721431f5 100644
--- a/src/views/modules/satisfaction/communitySelfInsp/followUpDetail.vue
+++ b/src/views/modules/satisfaction/communitySelfInsp/followUpDetail.vue
@@ -23,19 +23,19 @@
     <p>10、电话：{{ form.reporterMobile }}</p>
     <p>11、您是否接受回访</p>
     <section class="f-hflex">
-      <el-radio class="f-bot16" v-model="form.followUpStatus" disabled :label="-2">未知</el-radio>
-      <el-radio class="f-bot16" v-model="form.followUpStatus" disabled :label="-1">不接受回访</el-radio>
-      <el-radio class="f-bot16" v-model="form.followUpStatus" disabled :label="0">接受回访/待回访</el-radio>
-      <el-radio class="f-bot16" v-model="form.followUpStatus" disabled :label="1">已回访</el-radio>
+      <el-radio class="f-bot16" v-model.trim="form.followUpStatus" disabled :label="-2">未知</el-radio>
+      <el-radio class="f-bot16" v-model.trim="form.followUpStatus" disabled :label="-1">不接受回访</el-radio>
+      <el-radio class="f-bot16" v-model.trim="form.followUpStatus" disabled :label="0">接受回访/待回访</el-radio>
+      <el-radio class="f-bot16" v-model.trim="form.followUpStatus" disabled :label="1">已回访</el-radio>
     </section>
     <p v-if="form.followUpStatus === 0">12、请选择合适您的回访方式</p>
     <section class="f-hflex" v-if="form.followUpStatus === 0">
-      <el-radio class="f-bot16" v-model="form.expectFollowUpWay" disabled label="0">未知</el-radio>
-      <el-radio class="f-bot16" v-model="form.expectFollowUpWay" disabled label="1">电话回访</el-radio>
-      <el-radio class="f-bot16" v-model="form.expectFollowUpWay" disabled label="2">上门回访</el-radio>
+      <el-radio class="f-bot16" v-model.trim="form.expectFollowUpWay" disabled label="0">未知</el-radio>
+      <el-radio class="f-bot16" v-model.trim="form.expectFollowUpWay" disabled label="1">电话回访</el-radio>
+      <el-radio class="f-bot16" v-model.trim="form.expectFollowUpWay" disabled label="2">上门回访</el-radio>
     </section>
     <p>请填写您的家庭住址</p>
-    <el-input v-model="form.resideAddress" disabled></el-input>
+    <el-input v-model.trim="form.resideAddress" disabled></el-input>
     <el-row type="flex" justify="end" class="f-top12">
       <el-col :span="2">
         <el-button @click="handleClose"> 取消</el-button>
diff --git a/src/views/modules/satisfaction/communitySelfInsp/formList.vue b/src/views/modules/satisfaction/communitySelfInsp/formList.vue
index 02319bfee..93999e05c 100644
--- a/src/views/modules/satisfaction/communitySelfInsp/formList.vue
+++ b/src/views/modules/satisfaction/communitySelfInsp/formList.vue
@@ -2,7 +2,7 @@
     <div style="margin-top:10px" class="dialog-h-content">
         <el-form :inline="true" :model="formData" ref="ref_searchform" :label-width="'100px'">
             <el-form-item label="不满意类目" prop="startTime">
-                <el-select v-model="formData.satisfactionCategory" placeholder="请输入" size="small"
+                <el-select v-model.trim="formData.satisfactionCategory" placeholder="请输入" size="small"
                     class="u-item-width-normal"  @change="handleSearch" clearable>
                     <el-option v-for="item in dicts.satisfaction_category" :key="item.value" :label="item.label"
                         :value="item.value" >
@@ -10,7 +10,7 @@
                 </el-select>
             </el-form-item>
             <el-form-item label="不满意等级" prop="startTime">
-                <el-select v-model="formData.satisfactionLevel" placeholder="请输入" size="small" class="u-item-width-normal"
+                <el-select v-model.trim="formData.satisfactionLevel" placeholder="请输入" size="small" class="u-item-width-normal"
                     clearable  @change="handleSearch">
                     <el-option v-for="item in dicts.satisfaction_level" :key="item.value" :label="item.label"
                         :value="item.value">
diff --git a/src/views/modules/satisfaction/communitySelfInsp/index.vue b/src/views/modules/satisfaction/communitySelfInsp/index.vue
index 1a4d13ae2..a53173472 100644
--- a/src/views/modules/satisfaction/communitySelfInsp/index.vue
+++ b/src/views/modules/satisfaction/communitySelfInsp/index.vue
@@ -11,7 +11,7 @@
         >
           <el-form-item label="自评周期">
             <el-date-picker
-              v-model="formData.period"
+              v-model.trim="formData.period"
               type="month"
               value-format="yyyy-MM"
               placeholder="选择日期"
diff --git a/src/views/modules/satisfaction/detail/eventInfo.vue b/src/views/modules/satisfaction/detail/eventInfo.vue
index 2844e56d0..544f68359 100644
--- a/src/views/modules/satisfaction/detail/eventInfo.vue
+++ b/src/views/modules/satisfaction/detail/eventInfo.vue
@@ -30,7 +30,7 @@
         <div>
             <div class="m-table">
                 <div class="div_btn">
-                    <el-radio-group v-model="labelPosition" size="small" @change="selectPosition">
+                    <el-radio-group v-model.trim="labelPosition" size="small" @change="selectPosition">
                         <el-radio-button label="event">12345投诉</el-radio-button>
                         <el-radio-button label="province">省满意度调查</el-radio-button>
                         <el-radio-button label="community">社区自评</el-radio-button>
diff --git a/src/views/modules/satisfaction/detail/index.vue b/src/views/modules/satisfaction/detail/index.vue
index 80db2c62e..35b546fd5 100644
--- a/src/views/modules/satisfaction/detail/index.vue
+++ b/src/views/modules/satisfaction/detail/index.vue
@@ -6,7 +6,7 @@
                     <el-form :inline="true" :model="formData" ref="ref_searchform" :label-width="'100px'">
                         <el-form-item prop="gridId" label="所属组织">
                             <div class="resi-cell-value">
-                                <el-cascader class="customer_cascader" ref="myCascader" clearable v-model="agencyIdArray"
+                                <el-cascader class="customer_cascader" ref="myCascader" clearable v-model.trim="agencyIdArray"
                                     :options="orgOptions" :props="orgOptionProps" :show-all-levels="false"
                                     @change="handleChangeAgency"></el-cascader>
                             </div>
@@ -47,17 +47,17 @@
                         </el-form-item>
                         <br>
                         <el-form-item label="姓名" prop="name">
-                            <el-input v-model="formData.name" class="u-item-width-normal" size="small" clearable
+                            <el-input v-model.trim="formData.name" class="u-item-width-normal" size="small" clearable
                                 placeholder="请输入联系人姓名" style="width: 200px;">
                             </el-input>
                         </el-form-item>
                         <el-form-item label="联系电话" prop="mobile">
-                            <el-input v-model="formData.mobile" class="u-item-width-normal" size="small" clearable
+                            <el-input v-model.trim="formData.mobile" class="u-item-width-normal" size="small" clearable
                                 placeholder="请输入联系电话" style="width: 200px;">
                             </el-input>
                         </el-form-item>
                         <el-form-item label="证件号" prop="idCard">
-                            <el-input v-model="formData.idCard" class="u-item-width-normal" size="small" clearable
+                            <el-input v-model.trim="formData.idCard" class="u-item-width-normal" size="small" clearable
                                 placeholder="请输入证件号" style="width: 200px;">
                             </el-input>
                         </el-form-item>
diff --git a/src/views/modules/satisfaction/satisfactionProvince/followDetail.vue b/src/views/modules/satisfaction/satisfactionProvince/followDetail.vue
index 4b3b9f052..26d758bb6 100644
--- a/src/views/modules/satisfaction/satisfactionProvince/followDetail.vue
+++ b/src/views/modules/satisfaction/satisfactionProvince/followDetail.vue
@@ -34,25 +34,25 @@
         <el-row type="flex" justify="" class="f-top24">
             <el-col :span="24" class="f-flex f-align_item"><span class="label">是否完成：</span>
                 <div class="f-flex1">
-                   <el-radio v-model="formData.completeFlag" :label="0" :disabled="disabled" >正在推进</el-radio>
-                   <el-radio v-model="formData.completeFlag" :label="1" :disabled="disabled" >已完成</el-radio>
-                   <el-radio v-model="formData.completeFlag" :label="2" :disabled="disabled" >已完成并取消风险标记</el-radio>
+                   <el-radio v-model.trim="formData.completeFlag" :label="0" :disabled="disabled" >正在推进</el-radio>
+                   <el-radio v-model.trim="formData.completeFlag" :label="1" :disabled="disabled" >已完成</el-radio>
+                   <el-radio v-model.trim="formData.completeFlag" :label="2" :disabled="disabled" >已完成并取消风险标记</el-radio>
                 </div>
             </el-col>
         </el-row>
         <el-row type="flex" justify="" class="f-top24">
             <el-col :span="24" class="f-flex f-align_item"><span class="label">组织类型：</span>
                 <div class="f-flex1">
-                   <el-radio v-model="formData.orgCategoryCode" label="province" :disabled="disabled">省</el-radio>
-                   <el-radio v-model="formData.orgCategoryCode" label="city" :disabled="disabled">市</el-radio>
-                   <el-radio v-model="formData.orgCategoryCode" label="district" :disabled="disabled">区</el-radio>
+                   <el-radio v-model.trim="formData.orgCategoryCode" label="province" :disabled="disabled">省</el-radio>
+                   <el-radio v-model.trim="formData.orgCategoryCode" label="city" :disabled="disabled">市</el-radio>
+                   <el-radio v-model.trim="formData.orgCategoryCode" label="district" :disabled="disabled">区</el-radio>
                 </div>
             </el-col>
         </el-row>
         <el-row type="flex" justify="" class="f-top24">
             <el-col :span="24" class="f-flex f-align_item"><span class="label">完成时限：</span>
                 <div class="f-flex1">
-                    <el-date-picker v-model="formData.completeTime" type="date" value-format="yyyy-MM-dd HH:mm:ss" placeholder="选择日期"
+                    <el-date-picker v-model.trim="formData.completeTime" type="date" value-format="yyyy-MM-dd HH:mm:ss" placeholder="选择日期"
                             style="width: 202px" clearable :disabled="disabled">
                         </el-date-picker>
                 </div>
@@ -66,7 +66,7 @@
                       :rows="3"
                       style="width: 300px;"
                       placeholder="请输入内容"
-                      v-model="formData.remark"
+                      v-model.trim="formData.remark"
                       :disabled="disabled"
                       >
                     </el-input> 
diff --git a/src/views/modules/satisfaction/satisfactionProvince/formList.vue b/src/views/modules/satisfaction/satisfactionProvince/formList.vue
index d625d1cab..3a71a7cf5 100644
--- a/src/views/modules/satisfaction/satisfactionProvince/formList.vue
+++ b/src/views/modules/satisfaction/satisfactionProvince/formList.vue
@@ -3,13 +3,13 @@
         <el-form :inline="true" :model="formData" ref="ref_searchform" :label-width="'100px'">
             <el-form-item prop="gridId" label="所属组织">
                 <div class="resi-cell-value">
-                    <el-cascader class="customer_cascader" ref="myCascader" clearable v-model="agencyIdArray"
+                    <el-cascader class="customer_cascader" ref="myCascader" clearable v-model.trim="agencyIdArray"
                         :options="orgOptions" :props="orgOptionProps" :show-all-levels="false"
                         @change="handleChangeAgency"></el-cascader>
                 </div>
             </el-form-item>
             <el-form-item label="不满意类目" prop="startTime" >
-                <el-select v-model="formData.scopeId" placeholder="请输入" size="small" class="u-item-width-normal" @change="getTableData" clearable>
+                <el-select v-model.trim="formData.scopeId" placeholder="请输入" size="small" class="u-item-width-normal" @change="getTableData" clearable>
                     <el-option v-for="item in dicts.satisfaction_category" :key="item.value" :label="item.label"
                         :value="item.value">
                     </el-option>
diff --git a/src/views/modules/satisfaction/satisfactionProvince/index.vue b/src/views/modules/satisfaction/satisfactionProvince/index.vue
index 7903f541a..74e019092 100644
--- a/src/views/modules/satisfaction/satisfactionProvince/index.vue
+++ b/src/views/modules/satisfaction/satisfactionProvince/index.vue
@@ -11,7 +11,7 @@
         >
           <el-form-item label="自评周期">
             <el-date-picker
-              v-model="formData.periodStart"
+              v-model.trim="formData.periodStart"
               type="month"
               value-format="yyyy-MM"
               placeholder="选择日期"
@@ -72,7 +72,7 @@
           >
         </div>
         <el-radio-group
-          v-model="formData.orgCategoryCode"
+          v-model.trim="formData.orgCategoryCode"
           @change="handelChangeCategory"
           style="margin: 20px 0 0"
         >
diff --git a/src/views/modules/secretaryLog/difficulty/difficultyForm.vue b/src/views/modules/secretaryLog/difficulty/difficultyForm.vue
index 4274002ac..8d5478acd 100644
--- a/src/views/modules/secretaryLog/difficulty/difficultyForm.vue
+++ b/src/views/modules/secretaryLog/difficulty/difficultyForm.vue
@@ -20,7 +20,7 @@
                     :autosize="{ minRows: 4, maxRows: 10 }"
                     clearable
                     placeholder="请输入内容"
-                    v-model="formData.content"></el-input>
+                    v-model.trim="formData.content"></el-input>
         </el-form-item>
 
         <el-form-item label="解决方式"
@@ -34,7 +34,7 @@
                     :autosize="{ minRows: 4, maxRows: 10 }"
                     clearable
                     placeholder="请输入解决方式"
-                    v-model="formData.resolveWay"></el-input>
+                    v-model.trim="formData.resolveWay"></el-input>
         </el-form-item>
 
         <el-form-item label="预计处理时间"
@@ -42,7 +42,7 @@
                       prop="scheduledTime"
                       label-width="150px">
           <el-date-picker class="item_width_2"
-                          v-model="formData.scheduledTime"
+                          v-model.trim="formData.scheduledTime"
                           format="yyyy-MM-dd HH:mm"
                           value-format="yyyy-MM-dd HH:mm"
                           type="datetime"
@@ -55,7 +55,7 @@
                       prop="remindTime"
                       label-width="150px">
           <el-date-picker class="item_width_2"
-                          v-model="formData.remindTime"
+                          v-model.trim="formData.remindTime"
                           format="yyyy-MM-dd HH:mm"
                           value-format="yyyy-MM-dd HH:mm"
                           type="datetime"
@@ -77,7 +77,7 @@
                     :autosize="{ minRows: 4, maxRows: 10 }"
                     clearable
                     placeholder="请输入备注"
-                    v-model="formData.remark"></el-input>
+                    v-model.trim="formData.remark"></el-input>
         </el-form-item>
 
         <el-form-item class="block"
diff --git a/src/views/modules/secretaryLog/difficulty/difficultyList.vue b/src/views/modules/secretaryLog/difficulty/difficultyList.vue
index 246b4953a..2c98e57cf 100644
--- a/src/views/modules/secretaryLog/difficulty/difficultyList.vue
+++ b/src/views/modules/secretaryLog/difficulty/difficultyList.vue
@@ -9,7 +9,7 @@
         <div>
           <el-form-item label="内容摘要"
                         prop="content">
-            <el-input v-model="formData.content"
+            <el-input v-model.trim="formData.content"
                       size="small"
                       class="item_width_1"
                       clearable
@@ -20,7 +20,7 @@
 
           <el-form-item label="预计处理时间"
                         prop="scheduledStartTime">
-            <el-date-picker v-model="scheduledTimeRange"
+            <el-date-picker v-model.trim="scheduledTimeRange"
                             size="small"
                             type="daterange"
                             value-format="yyyy-MM-dd"
@@ -33,7 +33,7 @@
           </el-form-item>
           <el-form-item label="创建时间"
                         prop="startTime">
-            <el-date-picker v-model="timeRange"
+            <el-date-picker v-model.trim="timeRange"
                             size="small"
                             type="daterange"
                             value-format="yyyy-MM-dd"
diff --git a/src/views/modules/secretaryLog/humanisticCare/careForm.vue b/src/views/modules/secretaryLog/humanisticCare/careForm.vue
index 677f9e3a8..afad04ed2 100644
--- a/src/views/modules/secretaryLog/humanisticCare/careForm.vue
+++ b/src/views/modules/secretaryLog/humanisticCare/careForm.vue
@@ -16,7 +16,7 @@
           <el-input class="item_width_2"
                     placeholder="请输入关怀类型"
                     clearable
-                    v-model="formData.concernType">
+                    v-model.trim="formData.concernType">
           </el-input>
         </el-form-item>
 
@@ -27,7 +27,7 @@
           <el-input class="item_width_2"
                     placeholder="请输入关怀人员"
                     clearable
-                    v-model="formData.resiName">
+                    v-model.trim="formData.resiName">
           </el-input>
         </el-form-item>
 
@@ -38,7 +38,7 @@
           <el-input class="item_width_2"
                     placeholder="联系电话"
                     clearable
-                    v-model="formData.phone">
+                    v-model.trim="formData.phone">
           </el-input>
         </el-form-item>
         <el-form-item label="地址"
@@ -48,7 +48,7 @@
           <el-input class="item_width_1"
                     placeholder="请输入地址"
                     clearable
-                    v-model="formData.address">
+                    v-model.trim="formData.address">
           </el-input>
         </el-form-item>
 
@@ -63,7 +63,7 @@
                     :autosize="{ minRows: 4, maxRows: 10 }"
                     clearable
                     placeholder="请输入关怀事项"
-                    v-model="formData.content"></el-input>
+                    v-model.trim="formData.content"></el-input>
         </el-form-item>
 
         <el-form-item label="预计关怀时间"
@@ -71,7 +71,7 @@
                       prop="scheduledTime"
                       label-width="150px">
           <el-date-picker class="item_width_2"
-                          v-model="formData.scheduledTime"
+                          v-model.trim="formData.scheduledTime"
                           format="yyyy-MM-dd HH:mm"
                           value-format="yyyy-MM-dd HH:mm"
                           type="datetime"
@@ -84,7 +84,7 @@
                       prop="remindTime"
                       label-width="150px">
           <el-date-picker class="item_width_2"
-                          v-model="formData.remindTime"
+                          v-model.trim="formData.remindTime"
                           format="yyyy-MM-dd HH:mm"
                           value-format="yyyy-MM-dd HH:mm"
                           type="datetime"
@@ -100,7 +100,7 @@
                       prop="status">
 
           <el-select class="item_width_2"
-                     v-model="formData.status"
+                     v-model.trim="formData.status"
                      placeholder="请选择"
                      clearable>
             <el-option class="item_width_2"
diff --git a/src/views/modules/secretaryLog/humanisticCare/careList.vue b/src/views/modules/secretaryLog/humanisticCare/careList.vue
index 68f06fab1..594e74ffc 100644
--- a/src/views/modules/secretaryLog/humanisticCare/careList.vue
+++ b/src/views/modules/secretaryLog/humanisticCare/careList.vue
@@ -9,7 +9,7 @@
         <div>
           <el-form-item label="关怀类型"
                         prop="concernType">
-            <el-input v-model="formData.concernType"
+            <el-input v-model.trim="formData.concernType"
                       size="small"
                       class="item_width_1"
                       clearable
@@ -19,7 +19,7 @@
           </el-form-item>
           <el-form-item label="关怀人员"
                         prop="resiName">
-            <el-input v-model="formData.resiName"
+            <el-input v-model.trim="formData.resiName"
                       size="small"
                       class="item_width_1"
                       clearable
@@ -29,7 +29,7 @@
           </el-form-item>
           <el-form-item label="关怀事项"
                         prop="content">
-            <el-input v-model="formData.content"
+            <el-input v-model.trim="formData.content"
                       size="small"
                       class="item_width_1"
                       clearable
@@ -41,7 +41,7 @@
           <el-form-item label="状态"
                         prop="status">
             <el-select class="item_width_1"
-                       v-model="formData.status"
+                       v-model.trim="formData.status"
                        size="small"
                        placeholder="全部"
                        clearable>
@@ -59,7 +59,7 @@
 
           <el-form-item label="预计关怀时间"
                         prop="scheduledStartTime">
-            <el-date-picker v-model="scheduledTimeRange"
+            <el-date-picker v-model.trim="scheduledTimeRange"
                             size="small"
                             type="daterange"
                             value-format="yyyy-MM-dd"
@@ -72,7 +72,7 @@
           </el-form-item>
           <el-form-item label="创建时间"
                         prop="startTime">
-            <el-date-picker v-model="timeRange"
+            <el-date-picker v-model.trim="timeRange"
                             size="small"
                             type="daterange"
                             value-format="yyyy-MM-dd"
diff --git a/src/views/modules/secretaryLog/workLog/form.vue b/src/views/modules/secretaryLog/workLog/form.vue
index afda3a4b2..0a671e742 100644
--- a/src/views/modules/secretaryLog/workLog/form.vue
+++ b/src/views/modules/secretaryLog/workLog/form.vue
@@ -20,7 +20,7 @@
                     clearable
                     :disabled="disabled"
                     placeholder="请输入内容"
-                    v-model="formData.content"></el-input>
+                    v-model.trim="formData.content"></el-input>
         </el-form-item>
 
         <el-form-item label="工作事项"
@@ -35,14 +35,14 @@
                     clearable
                     :disabled="disabled"
                     placeholder="请输入工作事项"
-                    v-model="formData.workType"></el-input>
+                    v-model.trim="formData.workType"></el-input>
         </el-form-item>
         <el-form-item label="提醒时间"
                       style="display: block"
                       prop="remindTime"
                       label-width="150px">
           <el-date-picker class="item_width_2"
-                          v-model="formData.remindTime"
+                          v-model.trim="formData.remindTime"
                           format="yyyy-MM-dd HH:mm"
                           value-format="yyyy-MM-dd HH:mm"
                           type="datetime"
diff --git a/src/views/modules/secretaryLog/workLog/index.vue b/src/views/modules/secretaryLog/workLog/index.vue
index 19e65289f..1e35d2078 100644
--- a/src/views/modules/secretaryLog/workLog/index.vue
+++ b/src/views/modules/secretaryLog/workLog/index.vue
@@ -9,7 +9,7 @@
         <div>
           <el-form-item label="内容摘要"
                         prop="content">
-            <el-input v-model="formData.content"
+            <el-input v-model.trim="formData.content"
                       size="small"
                       class="item_width_1"
                       clearable
@@ -19,7 +19,7 @@
           </el-form-item>
           <el-form-item label="工作事项"
                         prop="content">
-            <el-input v-model="formData.workType"
+            <el-input v-model.trim="formData.workType"
                       size="small"
                       class="item_width_1"
                       clearable
@@ -29,7 +29,7 @@
           </el-form-item>
           <el-form-item label="创建时间"
                         prop="startTime">
-            <el-date-picker v-model="timeRange"
+            <el-date-picker v-model.trim="timeRange"
                             size="small"
                             type="daterange"
                             value-format="yyyy-MM-dd"
diff --git a/src/views/modules/shequ/chaxun.vue b/src/views/modules/shequ/chaxun.vue
index 8294d121a..045f3f271 100644
--- a/src/views/modules/shequ/chaxun.vue
+++ b/src/views/modules/shequ/chaxun.vue
@@ -26,7 +26,7 @@
               <input
                 type="text"
                 :placeholder="typePlaceholder[searchData.type]"
-                v-model="searchData.searchKey"
+                v-model.trim="searchData.searchKey"
                 @keyup.enter="handleClickSearchBtn"
               />
               <div
diff --git a/src/views/modules/shequ/cpts/people-more.vue b/src/views/modules/shequ/cpts/people-more.vue
index 5016f5be7..de462c83a 100644
--- a/src/views/modules/shequ/cpts/people-more.vue
+++ b/src/views/modules/shequ/cpts/people-more.vue
@@ -79,7 +79,7 @@
           </div>
         </div>
         <!-- 详情下方tab -->
-        <el-tabs class="f-top32" v-model="groupIndex"  @tab-click="handlTabs">
+        <el-tabs class="f-top32" v-model.trim="groupIndex"  @tab-click="handlTabs">
               <el-dropdown>
                   <img @mousemove="moreImgFlag = true" @mouseleave="moreImgFlag = false" :src="moreImgFlag==true?moreImg.src2:moreImg.src1" alt="" width="16px">
                   <el-dropdown-menu slot="dropdown" >
diff --git a/src/views/modules/shequ/cpts/smatr-rules.vue b/src/views/modules/shequ/cpts/smatr-rules.vue
index d069ccb54..cbd98d159 100644
--- a/src/views/modules/shequ/cpts/smatr-rules.vue
+++ b/src/views/modules/shequ/cpts/smatr-rules.vue
@@ -4,7 +4,7 @@
       <el-table-column label="选择数据源" align="center" width="120">
         <template slot-scope="scope">
           <el-select
-            v-model="scope.row.dataSource"
+            v-model.trim="scope.row.dataSource"
             placeholder="请选择"
             @change="handleChangeSource(scope.row, scope.$index)"
             clearable
@@ -22,7 +22,7 @@
       <el-table-column label="字段类别" align="center" width="120">
         <template slot-scope="scope">
           <el-select
-            v-model="scope.row.itemGroupId"
+            v-model.trim="scope.row.itemGroupId"
             placeholder="请选择"
             clearable
             @change="handleChangeFieldsType(scope.row, scope.$index)"
@@ -40,7 +40,7 @@
       <el-table-column label="字段名称" align="center" width="120">
         <template slot-scope="scope">
           <el-select
-            v-model="scope.row.itemId"
+            v-model.trim="scope.row.itemId"
             placeholder="请选择"
             @change="handleChangeFieldsName(scope.row, scope.$index)"
             @clear="handleClearItemId(scope.row, scope.$index)"
@@ -59,7 +59,7 @@
       <el-table-column label="比较符" align="center" width="120">
         <template slot-scope="scope">
           <el-select
-            v-model="scope.row.queryType"
+            v-model.trim="scope.row.queryType"
             placeholder="请选择"
             clearable
           >
@@ -82,7 +82,7 @@
                 item.itemType == 'radio' ||
                 item.itemType == 'checkbox'
               "
-              v-model="scope.row.colVal"
+              v-model.trim="scope.row.colVal"
               placeholder="请选择"
               clearable
             >
@@ -98,7 +98,7 @@
               v-else-if="
                 item.itemType === 'input' || item.itemType === 'textarea'
               "
-              v-model="scope.row.colVal"
+              v-model.trim="scope.row.colVal"
               placeholder="请输入"
               clearable
             >
@@ -106,7 +106,7 @@
             <el-input-number
               v-else-if="item.itemType === 'inputNum'"
               class="item_width_2"
-              v-model="scope.row.colVal"
+              v-model.trim="scope.row.colVal"
               :min="0"
               size="mini"
               label="请输入"
@@ -115,7 +115,7 @@
               v-else-if="
                 item.itemType === 'datepicker' || item.itemType === 'date'
               "
-              v-model="scope.row.colVal"
+              v-model.trim="scope.row.colVal"
               class="item_width_2"
               type="datetime"
               value-format="yyyy-MM-dd HH:mm:ss"
@@ -128,7 +128,7 @@
               class="item_width_2"
               size="mini"
               placeholder="请输入"
-              v-model="personItem.colVal"
+              v-model.trim="personItem.colVal"
             >
             </el-input>
           </template>
@@ -140,7 +140,7 @@
           v-if="scope.$index != tableData.length - 1"
         >
           <el-select
-            v-model="scope.row.nextLogicalRel"
+            v-model.trim="scope.row.nextLogicalRel"
             placeholder="请选择"
             clearable
             disabled
diff --git a/src/views/modules/shequ/index.vue b/src/views/modules/shequ/index.vue
index 9824cad02..c73e0af98 100644
--- a/src/views/modules/shequ/index.vue
+++ b/src/views/modules/shequ/index.vue
@@ -13,7 +13,7 @@
                 <el-dropdown
                   class="select"
                   placement="bottom"
-                  v-model="searchData.type"
+                  v-model.trim="searchData.type"
                   @command="(type) => (searchData.type = type)"
                 >
                   <span class="select-show">
@@ -33,7 +33,7 @@
                 <input
                   type="text"
                   :placeholder="typePlaceholder[searchData.type]"
-                  v-model="searchData.keyword"
+                  v-model.trim="searchData.keyword"
                   @keyup.enter="handleClickSearchBtn"
                 />
 
diff --git a/src/views/modules/shequzhili/csgltc/csgl.vue b/src/views/modules/shequzhili/csgltc/csgl.vue
index 56114a25c..e3ae62866 100644
--- a/src/views/modules/shequzhili/csgltc/csgl.vue
+++ b/src/views/modules/shequzhili/csgltc/csgl.vue
@@ -8,7 +8,7 @@
 
         <el-form-item label="场所名称"
                       prop="name">
-          <el-input v-model="formData.name"
+          <el-input v-model.trim="formData.name"
                     class="item_width_1"
                     clearable
                     size="small"
@@ -19,7 +19,7 @@
         <el-form-item label="场所分类"
                       prop="serviceMatter">
           <el-select class="item_width_1"
-                     v-model="formData.category"
+                     v-model.trim="formData.category"
                      placeholder="请选择"
                      size="small"
                      clearable>
diff --git a/src/views/modules/shequzhili/csgltc/csglForm.vue b/src/views/modules/shequzhili/csgltc/csglForm.vue
index 71c801c38..308ac3d37 100644
--- a/src/views/modules/shequzhili/csgltc/csglForm.vue
+++ b/src/views/modules/shequzhili/csgltc/csglForm.vue
@@ -17,7 +17,7 @@
                     maxlength="50"
                     show-word-limit
                     placeholder="请输入场所名称"
-                    v-model="formData.name">
+                    v-model.trim="formData.name">
           </el-input>
         </el-form-item>
         <!--<el-form-item label="场所类型"
@@ -25,7 +25,7 @@
                       label-width="150px"
                       style="display: block">
           <el-select class="item_width_1"
-                     v-model="formData.categoryName"
+                     v-model.trim="formData.categoryName"
                      placeholder="请选择"
                      filterable
                      clearable>
@@ -42,7 +42,7 @@
                       label-width="150px"
                       style="display: block">
           <el-select class="item_width_1"
-                     v-model="formData.category"
+                     v-model.trim="formData.category"
                      placeholder="请选择"
                      size="small"
                      filterable
@@ -61,7 +61,7 @@
                       prop="areaCovered"
                       label-width="150px">
           <el-input-number class="item_width_4"
-                           v-model="formData.areaCovered"
+                           v-model.trim="formData.areaCovered"
                            :precision="2"
                            :step="0.01"
                            :min="0"
@@ -73,7 +73,7 @@
                       prop="capacity"
                       label-width="150px">
           <el-input-number class="item_width_4"
-                           v-model="formData.capacity"
+                           v-model.trim="formData.capacity"
                            :min="0"
                            :max="9999"
                            label="容纳人数"></el-input-number>人
@@ -83,7 +83,7 @@
                       style="display: block"
                       label-width="150px"
                       prop="principal">
-          <el-input v-model="formData.principal"
+          <el-input v-model.trim="formData.principal"
                     class="item_width_1"
                     placeholder="请输入负责人姓名"></el-input>
         </el-form-item>
@@ -91,7 +91,7 @@
                       style="display: block"
                       label-width="150px"
                       prop="mobile">
-          <el-input v-model="formData.mobile"
+          <el-input v-model.trim="formData.mobile"
                     class="item_width_1"
                     placeholder="请输入联系电话"></el-input>
         </el-form-item>
@@ -101,7 +101,7 @@
                       label-width="150px"
                       style="display: block">
           <div style="width: 500px">
-            <el-select v-model="searchValue"
+            <el-select v-model.trim="searchValue"
                        filterable
                        style="width: 500px"
                        remote
@@ -129,7 +129,7 @@
                     maxlength="50"
                     show-word-limit
                     placeholder="请输入位置	"
-                    v-model="formData.address">
+                    v-model.trim="formData.address">
           </el-input>
         </el-form-item>
       </el-form>
diff --git a/src/views/modules/shequzhili/event/cpts/add.vue b/src/views/modules/shequzhili/event/cpts/add.vue
index dfb3c9623..04f2d7dbb 100644
--- a/src/views/modules/shequzhili/event/cpts/add.vue
+++ b/src/views/modules/shequzhili/event/cpts/add.vue
@@ -8,13 +8,13 @@
                             <el-option v-for="item in gridList" :key="item.value" :label="item.label" :value="item.value">
                             </el-option>
                         </el-select> -->
-                        <el-cascader class="u-item-width-normal" size="small" ref="myCascader" v-model="formData.gridId"
+                        <el-cascader class="u-item-width-normal" size="small" ref="myCascader" v-model.trim="formData.gridId"
                             :options="orgOptions" :props="orgOptionProps" :show-all-levels="false"
                             @change="handleChangeAgency" clearable></el-cascader>
                     </el-form-item>
 
                     <el-form-item label="上报渠道" label-width="150px" prop="sourceType">
-                        <el-select v-model="formData.sourceType" placeholder="请选择" size="small" clearable
+                        <el-select v-model.trim="formData.sourceType" placeholder="请选择" size="small" clearable
                             class="cell-width-1">
                             <el-option v-for="item in qudaoArray" :key="item.value" :label="item.label" :value="item.value">
                             </el-option>
@@ -22,30 +22,30 @@
                     </el-form-item>
                     <el-form-item label="工单号" prop="workOrderNum" label-width="150px" style="display: block">
                         <el-input class="cell-width-1" maxlength="30" placeholder="请输入工单号"
-                            v-model="formData.workOrderNum" />
+                            v-model.trim="formData.workOrderNum" />
                     </el-form-item>
                     <el-form-item label="接收时间" prop="happenTime" label-width="150px" style="display: block">
-                        <el-date-picker v-model="formData.happenTime" class="cell-width-1" type="datetime"
+                        <el-date-picker v-model.trim="formData.happenTime" class="cell-width-1" type="datetime"
                             placeholder="接收时间" value-format="yyyy-MM-dd HH:mm:ss">
                         </el-date-picker>
                     </el-form-item>
 
                     <el-form-item label="问题描述" prop="eventContent" label-width="150px" style="display: block">
                         <el-input class="cell-width-2" type="textarea" maxlength="500" show-word-limit :rows="5"
-                            placeholder="请输入事件问题描述，不超过500字" v-model="formData.eventContent"></el-input>
+                            placeholder="请输入事件问题描述，不超过500字" v-model.trim="formData.eventContent"></el-input>
                     </el-form-item>
 
                     <el-form-item label="联系人" prop="name" label-width="150px" style="display: block">
-                        <el-input class="cell-width-1" maxlength="10" placeholder="请输入联系人姓名" v-model="formData.name" />
+                        <el-input class="cell-width-1" maxlength="10" placeholder="请输入联系人姓名" v-model.trim="formData.name" />
                     </el-form-item>
                     <el-form-item label="联系电话" prop="mobile" label-width="150px" style="display: block">
-                        <el-input class="cell-width-1" maxlength="30" placeholder="请输入联系电话	" v-model="formData.mobile">
+                        <el-input class="cell-width-1" maxlength="30" placeholder="请输入联系电话	" v-model.trim="formData.mobile">
                         </el-input>
                     </el-form-item>
                     <!-- 
                     <el-form-item label="证件号" prop="idCard" label-width="150px" style="display: block">
                         <el-input class="cell-width-1" maxlength="30" placeholder="请输入证件号"
-                            v-model="formData.idCard"></el-input>
+                            v-model.trim="formData.idCard"></el-input>
                     </el-form-item> -->
                 </el-form>
             </div>
@@ -67,7 +67,7 @@
                     <el-form-item label="地图位置" prop="longitude" label-width="150px" style="display: block">
                         <div style="width: 500px">
                             <el-form-item prop="location" style="display: block">
-                                <el-select v-model="formData.location" filterable remote :reserve-keyword="true"
+                                <el-select v-model.trim="formData.location" filterable remote :reserve-keyword="true"
                                     placeholder="请输入关键词" :remote-method="remoteMethod" :loading="loading"
                                     @keyup.enter.native="remoteMethod(formData.location)">
                                     <el-option v-for="(item, index) in searchOptions" @click.native="handleClickKey(index)"
@@ -79,7 +79,7 @@
                     </el-form-item>
 
                     <el-form-item label="详细地址" prop="address" label-width="150px" style="display: block">
-                        <el-input class="cell-width-1" v-model="formData.address">
+                        <el-input class="cell-width-1" v-model.trim="formData.address">
                         </el-input>
                     </el-form-item>
                 </el-form>
@@ -99,7 +99,7 @@
                         </el-select>
                     </el-form-item>
                     <el-form-item label="居民" label-width="150px" prop="selPersonIndex">
-                        <el-select v-model="selPersonIndex" class="cell-width-1" filterable placeholder="请选择" clearable>
+                        <el-select v-model.trim="selPersonIndex" class="cell-width-1" filterable placeholder="请选择" clearable>
                             <el-option v-for="(item, index) in demandUserList" :key="item.demandUserId" :label="item.label"
                                 :value="index">
                             </el-option>
diff --git a/src/views/modules/shequzhili/event/cpts/event-detail.vue b/src/views/modules/shequzhili/event/cpts/event-detail.vue
index 7fe3ef1ec..ec10ab525 100644
--- a/src/views/modules/shequzhili/event/cpts/event-detail.vue
+++ b/src/views/modules/shequzhili/event/cpts/event-detail.vue
@@ -82,7 +82,7 @@
             <div class="m-detail-main">
                 <div class="m-info">
                     <div class="div-satisfy">
-                        <el-radio-group :class="{ 'form-item': source === 'visiual' }" v-model="satisfyLevel"
+                        <el-radio-group :class="{ 'form-item': source === 'visiual' }" v-model.trim="satisfyLevel"
                             @change="clickSatisfy">
                             <el-radio label="good">满意</el-radio>
                             <el-radio label="perfect">非常满意</el-radio>
diff --git a/src/views/modules/shequzhili/event/cpts/myCascader.vue b/src/views/modules/shequzhili/event/cpts/myCascader.vue
index f5a9f76aa..b4995da31 100644
--- a/src/views/modules/shequzhili/event/cpts/myCascader.vue
+++ b/src/views/modules/shequzhili/event/cpts/myCascader.vue
@@ -2,7 +2,7 @@
     <div>
         <el-form :model="form">
             <el-form-item>
-                <el-cascader class="cell-width-2" ref="myCascader" v-model="form.selCategoryArray" :key="iscascaderShow"
+                <el-cascader class="cell-width-2" ref="myCascader" v-model.trim="form.selCategoryArray" :key="iscascaderShow"
                     :options="casOptions" :props="optionProps" :show-all-levels="false" clearable
                     @change="handleChangeCate"></el-cascader>
             </el-form-item>
diff --git a/src/views/modules/shequzhili/event/cpts/process-form-demand.vue b/src/views/modules/shequzhili/event/cpts/process-form-demand.vue
index 6a2b7f420..c1b8f432c 100644
--- a/src/views/modules/shequzhili/event/cpts/process-form-demand.vue
+++ b/src/views/modules/shequzhili/event/cpts/process-form-demand.vue
@@ -10,7 +10,7 @@
                     prop="categoryId">
         <el-cascader class="cell-width-2"
                      ref="myCascader"
-                     v-model="selCategoryArray"
+                     v-model.trim="selCategoryArray"
                      :key="iscascaderShow"
                      :options="casOptions"
                      :props="optionProps"
@@ -22,7 +22,7 @@
                     :class="{'form-item':source==='visiual'}"
                     prop="content">
         <div :class="{'visiual-form':source==='visiual'}">
-          <el-input v-model="formData.content"
+          <el-input v-model.trim="formData.content"
                     :autosize="{ minRows: 2, maxRows: 10 }"
                     type="textarea"
                     clearable
@@ -37,7 +37,7 @@
                     prop="categoryCode">
         <div :class="{'visiual-form':source==='visiual'}">
 
-          <el-cascader v-model="formData.categoryCode"
+          <el-cascader v-model.trim="formData.categoryCode"
                        :options="demandOptions"
                        clearable
                        class="cell-width-1"
@@ -51,7 +51,7 @@
                     :class="{'form-item':source==='visiual'}"
                     prop="wantServiceTime">
         <div :class="{'visiual-form':source==='visiual'}">
-          <el-date-picker v-model="formData.wantServiceTime"
+          <el-date-picker v-model.trim="formData.wantServiceTime"
                           type="datetime"
                           class="cell-width-1"
                           clearable
@@ -66,7 +66,7 @@
                     :class="{'form-item':source==='visiual'}"
                     prop="demandUserName">
         <div :class="{'visiual-form':source==='visiual'}">
-          <el-input v-model="formData.demandUserName"
+          <el-input v-model.trim="formData.demandUserName"
                     class="cell-width-1"></el-input>
         </div>
 
@@ -76,7 +76,7 @@
                     :class="{'form-item':source==='visiual'}"
                     prop="demandUserMobile">
         <div :class="{'visiual-form':source==='visiual'}">
-          <el-input v-model="formData.demandUserMobile"
+          <el-input v-model.trim="formData.demandUserMobile"
                     class="cell-width-1"></el-input>
         </div>
 
@@ -89,7 +89,7 @@
 
         <div :class="{'visiual-form':source==='visiual'}">
           <el-input class="cell-width-1"
-                    v-model="formData.serviceLocation">
+                    v-model.trim="formData.serviceLocation">
           </el-input>
         </div>
 
@@ -110,7 +110,7 @@
                         maxlength="50"
                         size="mini"
                         placeholder="请输入关键字"
-                        v-model="keyWords">
+                        v-model.trim="keyWords">
               </el-input>
               <el-button style="margin-left: 10px"
                          type="primary"
@@ -124,13 +124,13 @@
             <el-input class="item_width_3"
                       maxlength="50"
                       placeholder="请输入经度"
-                      v-model="formData.longitude">
+                      v-model.trim="formData.longitude">
             </el-input>
             <span style="margin-left: 20px">纬度</span>
             <el-input class="item_width_3"
                       maxlength="50"
                       placeholder="请输入纬度"
-                      v-model="formData.latitude">
+                      v-model.trim="formData.latitude">
             </el-input>
           </div> -->
         </div>
@@ -141,7 +141,7 @@
                     label-width="150px"
                     prop="locationDetail">
         <div :class="{'visiual-form':source==='visiual'}">
-          <el-input v-model="formData.locationDetail"
+          <el-input v-model.trim="formData.locationDetail"
                     class="cell-width-1"></el-input>
         </div>
 
@@ -154,7 +154,7 @@
 
         <template>
           <div :class="[{'single-select':source==='visiual'},'sel-service']">
-            <el-select v-model="formData.serviceType"
+            <el-select v-model.trim="formData.serviceType"
                        class="cell-width-1"
                        placeholder="请选择"
                        clearable
@@ -166,7 +166,7 @@
               </el-option>
             </el-select>
             -
-            <el-select v-model="formData.serverId"
+            <el-select v-model.trim="formData.serverId"
                        class="cell-width-1"
                        filterable
                        placeholder="请选择"
diff --git a/src/views/modules/shequzhili/event/cpts/process-form-designate.vue b/src/views/modules/shequzhili/event/cpts/process-form-designate.vue
index a87027c5c..668477a7d 100644
--- a/src/views/modules/shequzhili/event/cpts/process-form-designate.vue
+++ b/src/views/modules/shequzhili/event/cpts/process-form-designate.vue
@@ -12,20 +12,20 @@
             <el-form-item label="事件分类" label-width="150px" :class="{ 'form-item': source === 'visiual' }"
                 prop="categoryList">
                 <div :class="{ 'visiual-form': source === 'visiual' }">
-                    <el-cascader class="cell-width-2" ref="myCascader" v-model="selCategoryArray" :key="iscascaderShow"
+                    <el-cascader class="cell-width-2" ref="myCascader" v-model.trim="selCategoryArray" :key="iscascaderShow"
                         :options="casOptions" :props="optionProps" :show-all-levels="false" clearable
                         @change="handleChangeCate"></el-cascader>
                 </div>
             </el-form-item>
             <el-form-item label="处理部门" prop="deptId" label-width="150px" :class="{ 'form-item': source === 'visiual' }">
-                <el-cascader class="cell-width-2" ref="agencyIdArray" v-model="agencyIdArray" :options="orgOptions"
+                <el-cascader class="cell-width-2" ref="agencyIdArray" v-model.trim="agencyIdArray" :options="orgOptions"
                     :props="orgOptionProps" :show-all-levels="false" @change="handleChangeAgency"></el-cascader>
             </el-form-item>
             <el-form-item label="转办意见" prop="content" label-width="150px" :class="{ 'form-item': source === 'visiual' }"
                 style="display: block">
                 <div :class="{ 'visiual-form': source === 'visiual' }">
                     <el-input class="cell-width-area" type="textarea" maxlength="500" show-word-limit :rows="5"
-                        placeholder="请输入转办意见，不超过500字" v-model="formData.content"></el-input>
+                        placeholder="请输入转办意见，不超过500字" v-model.trim="formData.content"></el-input>
                 </div>
             </el-form-item>
             <el-form-item style="display: block" label="附件" label-width="150px" prop="attach">
@@ -40,7 +40,7 @@
             <el-form-item label="办结时限" prop="timeLimit" label-width="150px" :class="{ 'form-item': source === 'visiual' }"
                 style="display: block">
                 <div :class="{ 'visiual-form': source === 'visiual' }">
-                    <el-date-picker v-model="formData.timeLimit" class="cell-width-1" type="datetime" placeholder="办结时限"
+                    <el-date-picker v-model.trim="formData.timeLimit" class="cell-width-1" type="datetime" placeholder="办结时限"
                         value-format="yyyy-MM-dd HH:mm:ss">
                     </el-date-picker>
                 </div>
diff --git a/src/views/modules/shequzhili/event/cpts/process-form-issue.vue b/src/views/modules/shequzhili/event/cpts/process-form-issue.vue
index e6f72f749..8776753ab 100644
--- a/src/views/modules/shequzhili/event/cpts/process-form-issue.vue
+++ b/src/views/modules/shequzhili/event/cpts/process-form-issue.vue
@@ -12,13 +12,13 @@
         <div :class="{'visiual-form':source==='visiual'}">
           <!-- <el-cascader class="cell-width-2"
                        ref="myCascader"
-                       v-model="selCategoryArray"
+                       v-model.trim="selCategoryArray"
                        :key="iscascaderShow"
                        :options="casOptions"
                        :props="optionProps"
                        :show-all-levels="false"
                        @change="handleChangeCate"></el-cascader> -->
-                       <my-cascader v-model="formData.categoryList"
+                       <my-cascader v-model.trim="formData.categoryList"
             :casOptions="casOptions"
             :optionProps="optionProps"
             @handleChangeCate="handleChangeCate">
@@ -32,7 +32,7 @@
                     :class="{'form-item':source==='visiual'}"
                     style="display: block">
         <div :class="{'visiual-form':source==='visiual'}">
-          <el-input v-model="formData.issueTitle"
+          <el-input v-model.trim="formData.issueTitle"
                     class="cell-width-2"
                     clearable
                     placeholder="请输入议题标题">
@@ -52,7 +52,7 @@
                     show-word-limit
                     :rows="5"
                     placeholder="请输入处理意见，不超过500字"
-                    v-model="formData.suggestion"></el-input>
+                    v-model.trim="formData.suggestion"></el-input>
         </div>
 
       </el-form-item>
diff --git a/src/views/modules/shequzhili/event/cpts/process-form-project.vue b/src/views/modules/shequzhili/event/cpts/process-form-project.vue
index 7dbabcd01..5216dd725 100644
--- a/src/views/modules/shequzhili/event/cpts/process-form-project.vue
+++ b/src/views/modules/shequzhili/event/cpts/process-form-project.vue
@@ -16,14 +16,14 @@
         <div :class="{ 'visiual-form': source === 'visiual' }">
           <!-- <el-cascader class="cell-width-2"
                        ref="myCascader"
-                       v-model="selCategoryArray"
+                       v-model.trim="selCategoryArray"
                        :key="iscascaderShow"
                        :options="casOptions"
                        :props="optionProps"
                        :show-all-levels="false"
                        @change="handleChangeCate"></el-cascader> -->
           <my-cascader
-            v-model="formData.categoryList"
+            v-model.trim="formData.categoryList"
             :casOptions="casOptions"
             :props="optionProps"
             :optionProps="optionProps"
@@ -43,7 +43,7 @@
             class="cell-width-1"
             maxlength="50"
             placeholder="请输入项目标题"
-            v-model="formData.title"
+            v-model.trim="formData.title"
           >
           </el-input>
         </div>
@@ -84,7 +84,7 @@
           placement="bottom"
           width="400"
           height="400"
-          v-model="visibleStaffPanel"
+          v-model.trim="visibleStaffPanel"
         >
           <div class="f">
             <select-staff
@@ -133,7 +133,7 @@
             class="cell-width-area"
             :rows="2"
             placeholder="请输入项目方案"
-            v-model="formData.publicReply"
+            v-model.trim="formData.publicReply"
           >
           </el-input>
         </div>
@@ -151,7 +151,7 @@
             class="cell-width-area"
             :rows="2"
             placeholder="请输入内部备注"
-            v-model="formData.internalRemark"
+            v-model.trim="formData.internalRemark"
           >
           </el-input>
         </div>
@@ -198,13 +198,13 @@
           placement="top"
           width="450"
           height="450"
-          v-model="visibleTagPanel"
+          v-model.trim="visibleTagPanel"
         >
           <div class="f" style="min-height: 120px">
             <h2>选择标签</h2>
             <el-select
               style="width: 350px"
-              v-model="selectedTagData"
+              v-model.trim="selectedTagData"
               multiple
               allow-create
               filterable
diff --git a/src/views/modules/shequzhili/event/cpts/process-form-replay-end.vue b/src/views/modules/shequzhili/event/cpts/process-form-replay-end.vue
index 44334b2dc..4ce92854f 100644
--- a/src/views/modules/shequzhili/event/cpts/process-form-replay-end.vue
+++ b/src/views/modules/shequzhili/event/cpts/process-form-replay-end.vue
@@ -13,7 +13,7 @@
             <el-form-item label="事件分类" label-width="150px" :class="{ 'form-item': source === 'visiual' }"
                 prop="categoryList">
                 <div :class="{ 'visiual-form': source === 'visiual' }">
-                    <el-cascader class="cell-width-2" ref="myCascader" v-model="selCategoryArray" :key="iscascaderShow"
+                    <el-cascader class="cell-width-2" ref="myCascader" v-model.trim="selCategoryArray" :key="iscascaderShow"
                         :options="casOptions" :props="optionProps" :show-all-levels="false" clearable
                         @change="handleChangeCate"></el-cascader>
                 </div>
@@ -22,7 +22,7 @@
                 style="display: block">
                 <div :class="{ 'visiual-form': source === 'visiual' }">
                     <el-input class="cell-width-area" type="textarea" maxlength="500" show-word-limit :rows="5"
-                        placeholder="请输入回复内容，不超过500字" v-model="formData.content"></el-input>
+                        placeholder="请输入回复内容，不超过500字" v-model.trim="formData.content"></el-input>
                 </div>
             </el-form-item>
             <el-form-item style="display: block" label="附件" label-width="150px" prop="attach">
diff --git a/src/views/modules/shequzhili/event/cpts/process-form-replay.vue b/src/views/modules/shequzhili/event/cpts/process-form-replay.vue
index d90e89119..0de8b5d45 100644
--- a/src/views/modules/shequzhili/event/cpts/process-form-replay.vue
+++ b/src/views/modules/shequzhili/event/cpts/process-form-replay.vue
@@ -4,7 +4,7 @@
             <el-form-item label="事件分类" label-width="150px" :class="{ 'form-item': source === 'visiual' }"
                 prop="categoryList">
                 <div :class="{ 'visiual-form': source === 'visiual' }">
-                    <el-cascader class="cell-width-2" ref="myCascader" v-model="selCategoryArray" :key="iscascaderShow"
+                    <el-cascader class="cell-width-2" ref="myCascader" v-model.trim="selCategoryArray" :key="iscascaderShow"
                         :options="casOptions" :props="optionProps" :show-all-levels="false" clearable
                         @change="handleChangeCate"></el-cascader>
                 </div>
@@ -13,13 +13,13 @@
                 style="display: block">
                 <div :class="{ 'visiual-form': source === 'visiual' }">
                     <el-input class="cell-width-area" type="textarea" maxlength="500" show-word-limit :rows="5"
-                        placeholder="请输入回复内容，不超过500字" v-model="formData.content"></el-input>
+                        placeholder="请输入回复内容，不超过500字" v-model.trim="formData.content"></el-input>
                 </div>
             </el-form-item>
             <el-form-item label="办结时限" prop="timeLimit" label-width="150px" :class="{ 'form-item': source === 'visiual' }"
                 style="display: block">
                 <div :class="{ 'visiual-form': source === 'visiual' }">
-                    <el-date-picker v-model="formData.timeLimit" class="cell-width-1" type="datetime" placeholder="办结时限"
+                    <el-date-picker v-model.trim="formData.timeLimit" class="cell-width-1" type="datetime" placeholder="办结时限"
                         value-format="yyyy-MM-dd HH:mm:ss">
                     </el-date-picker>
                 </div>
diff --git a/src/views/modules/shequzhili/event/cpts/process-form.vue b/src/views/modules/shequzhili/event/cpts/process-form.vue
index fec3ccd42..095913d6f 100644
--- a/src/views/modules/shequzhili/event/cpts/process-form.vue
+++ b/src/views/modules/shequzhili/event/cpts/process-form.vue
@@ -4,7 +4,7 @@
             <el-form ref="ref_form1" :inline="false" :rules="dataRule" class="form">
                 <el-form-item label="处理方式" label-width="150px" :class="{ 'form-item': source === 'visiual' }"
                     prop="operationType">
-                    <el-radio-group :class="{ 'form-item': source === 'visiual' }" v-model="operationType"
+                    <el-radio-group :class="{ 'form-item': source === 'visiual' }" v-model.trim="operationType"
                         @change="handleChangeOperationType">
                         <el-radio v-if="!eventId" label="4">待处理</el-radio>
                         <el-radio label="0">回复</el-radio>
diff --git a/src/views/modules/shequzhili/event/eventList.vue b/src/views/modules/shequzhili/event/eventList.vue
index 676b33818..67bade134 100644
--- a/src/views/modules/shequzhili/event/eventList.vue
+++ b/src/views/modules/shequzhili/event/eventList.vue
@@ -6,11 +6,11 @@
                     <div>
                         <el-form-item label="所属组织" prop="gridId">
                             <el-cascader class="u-item-width-normal" size="small" ref="myCascader"
-                                v-model="formData.agencyId" :options="orgOptions" :props="orgOptionProps"
+                                v-model.trim="formData.agencyId" :options="orgOptions" :props="orgOptionProps"
                                 :show-all-levels="false" @change="handleChangeAgency" clearable></el-cascader>
                         </el-form-item>
                         <el-form-item label="上报渠道" prop="sourceType">
-                            <el-select v-model="formData.sourceType" placeholder="请选择" size="small" clearable
+                            <el-select v-model.trim="formData.sourceType" placeholder="请选择" size="small" clearable
                                 class="u-item-width-normal">
                                 <el-option v-for="item in qudaoArray" :key="item.value" :label="item.label"
                                     :value="item.value">
@@ -19,7 +19,7 @@
                         </el-form-item>
 
                         <el-form-item label="事件分类" prop="firstIdList">
-                            <el-cascader ref="cascaderEvent" v-model="eventTypeCheck" :options="cateOptions" collapse-tags
+                            <el-cascader ref="cascaderEvent" v-model.trim="eventTypeCheck" :options="cateOptions" collapse-tags
                                 :show-all-levels="false" :props="{
                                     multiple: true,
                                     checkStrictly: false,
@@ -36,37 +36,37 @@
                             </el-cascader> -->
                         </el-form-item>
                         <el-form-item label="接收时间" prop="startTime">
-                            <el-date-picker v-model="formData.startTime" class="u-item-width-daterange" size="small"
+                            <el-date-picker v-model.trim="formData.startTime" class="u-item-width-daterange" size="small"
                                 type="date" value-format="yyyy-MM-dd HH:mm:ss" value="yyyy-MM-dd" placeholder="开始时间">
                             </el-date-picker>
                             <span class="u-data-tag">至</span>
-                            <el-date-picker v-model="formData.endTime" class="u-item-width-daterange u-data-tag"
+                            <el-date-picker v-model.trim="formData.endTime" class="u-item-width-daterange u-data-tag"
                                 size="small" type="date" value-format="yyyy-MM-dd HH:mm:ss" value="yyyy-MM-dd"
                                 placeholder="结束时间">
                             </el-date-picker>
                         </el-form-item>
                         <el-form-item label="工单号" prop="workOrderNum">
-                            <el-input v-model="formData.workOrderNum" class="u-item-width-normal" size="small" clearable
+                            <el-input v-model.trim="formData.workOrderNum" class="u-item-width-normal" size="small" clearable
                                 placeholder="请输入工单号">
                             </el-input>
                         </el-form-item>
                         <el-form-item label="问题描述" prop="eventContent">
-                            <el-input v-model="formData.eventContent" class="u-item-width-normal" size="small" clearable
+                            <el-input v-model.trim="formData.eventContent" class="u-item-width-normal" size="small" clearable
                                 placeholder="请输入事件问题描述">
                             </el-input>
                         </el-form-item>
                         <el-form-item label="联系人" prop="name">
-                            <el-input v-model="formData.name" class="u-item-width-normal" size="small" clearable
+                            <el-input v-model.trim="formData.name" class="u-item-width-normal" size="small" clearable
                                 placeholder="请输入联系人">
                             </el-input>
                         </el-form-item>
                         <el-form-item label="联系电话" prop="mobile">
-                            <el-input v-model="formData.mobile" class="u-item-width-normal" size="small" clearable
+                            <el-input v-model.trim="formData.mobile" class="u-item-width-normal" size="small" clearable
                                 placeholder="请输入联系电话">
                             </el-input>
                         </el-form-item>
                         <el-form-item label="处理状态" prop="status">
-                            <el-select class="u-item-width-normal" v-model="formData.status" placeholder="全部" size="small"
+                            <el-select class="u-item-width-normal" v-model.trim="formData.status" placeholder="全部" size="small"
                                 clearable>
                                 <el-option v-for="item in statusArray" :key="item.value" :label="item.label"
                                     :value="item.value">
@@ -74,17 +74,17 @@
                             </el-select>
                         </el-form-item>
                         <el-form-item label="办结时限" prop="limitStartTime">
-                            <el-date-picker v-model="formData.limitStartTime" class="u-item-width-daterange" size="small"
+                            <el-date-picker v-model.trim="formData.limitStartTime" class="u-item-width-daterange" size="small"
                                 type="date" value-format="yyyy-MM-dd HH:mm:ss" value="yyyy-MM-dd" placeholder="开始时间">
                             </el-date-picker>
                             <span class="u-data-tag">至</span>
-                            <el-date-picker v-model="formData.limitEndTime" class="u-item-width-daterange u-data-tag"
+                            <el-date-picker v-model.trim="formData.limitEndTime" class="u-item-width-daterange u-data-tag"
                                 size="small" type="date" value-format="yyyy-MM-dd HH:mm:ss" value="yyyy-MM-dd"
                                 placeholder="结束时间">
                             </el-date-picker>
                         </el-form-item>
                         <el-form-item label="标记" prop="type">
-                            <el-select class="u-item-width-normal" v-model="formData.type" placeholder="全部" size="small"
+                            <el-select class="u-item-width-normal" v-model.trim="formData.type" placeholder="全部" size="small"
                                 clearable>
                                 <el-option v-for="item in typeArray" :key="item.value" :label="item.label"
                                     :value="item.value">
diff --git a/src/views/modules/shequzhili/eventOld/cpts/add.vue b/src/views/modules/shequzhili/eventOld/cpts/add.vue
index 9e67e0e37..ee455a8e4 100644
--- a/src/views/modules/shequzhili/eventOld/cpts/add.vue
+++ b/src/views/modules/shequzhili/eventOld/cpts/add.vue
@@ -8,13 +8,13 @@
                             <el-option v-for="item in gridList" :key="item.value" :label="item.label" :value="item.value">
                             </el-option>
                         </el-select> -->
-                        <el-cascader class="u-item-width-normal" size="small" ref="myCascader" v-model="formData.gridId"
+                        <el-cascader class="u-item-width-normal" size="small" ref="myCascader" v-model.trim="formData.gridId"
                             :options="orgOptions" :props="orgOptionProps" :show-all-levels="false"
                             @change="handleChangeAgency" clearable></el-cascader>
                     </el-form-item>
 
                     <el-form-item label="上报人" prop="name" label-width="150px" style="display: block">
-                        <el-input class="cell-width-1" maxlength="10" placeholder="请输入上报人姓名" v-model="formData.name">
+                        <el-input class="cell-width-1" maxlength="10" placeholder="请输入上报人姓名" v-model.trim="formData.name">
                         </el-input>
                         <div>
                             <el-button style="margin-top: 10px" type="primary" size="mini"
@@ -22,17 +22,17 @@
                         </div>
                     </el-form-item>
                     <el-form-item label="联系电话" prop="mobile" label-width="150px" style="display: block">
-                        <el-input class="cell-width-1" maxlength="30" placeholder="请输入联系电话	" v-model="formData.mobile">
+                        <el-input class="cell-width-1" maxlength="30" placeholder="请输入联系电话	" v-model.trim="formData.mobile">
                         </el-input>
                     </el-form-item>
 
                     <el-form-item label="证件号" prop="idCard" label-width="150px" style="display: block">
                         <el-input class="cell-width-1" maxlength="30" placeholder="请输入证件号"
-                            v-model="formData.idCard"></el-input>
+                            v-model.trim="formData.idCard"></el-input>
                     </el-form-item>
 
                     <el-form-item label="反应渠道" label-width="150px" prop="sourceType">
-                        <el-select v-model="formData.sourceType" placeholder="请选择" size="small" clearable
+                        <el-select v-model.trim="formData.sourceType" placeholder="请选择" size="small" clearable
                             class="cell-width-1">
                             <el-option v-for="item in qudaoArray" :key="item.value" :label="item.label" :value="item.value">
                             </el-option>
@@ -40,14 +40,14 @@
                     </el-form-item>
 
                     <el-form-item label="上报时间" prop="happenTime" label-width="150px" style="display: block">
-                        <el-date-picker v-model="formData.happenTime" class="cell-width-1" type="datetime"
+                        <el-date-picker v-model.trim="formData.happenTime" class="cell-width-1" type="datetime"
                             placeholder="上报时间" value-format="yyyy-MM-dd HH:mm:ss">
                         </el-date-picker>
                     </el-form-item>
 
                     <el-form-item label="事件内容" prop="eventContent" label-width="150px" style="display: block">
                         <el-input class="cell-width-2" type="textarea" maxlength="500" show-word-limit :rows="5"
-                            placeholder="请输入事件内容，不超过500字" v-model="formData.eventContent"></el-input>
+                            placeholder="请输入事件内容，不超过500字" v-model.trim="formData.eventContent"></el-input>
                     </el-form-item>
                 </el-form>
             </div>
@@ -69,7 +69,7 @@
                     <el-form-item label="地图位置" prop="longitude" label-width="150px" style="display: block">
                         <div style="width: 500px">
                             <el-form-item prop="location" style="display: block">
-                                <el-select v-model="formData.location" filterable remote :reserve-keyword="true"
+                                <el-select v-model.trim="formData.location" filterable remote :reserve-keyword="true"
                                     placeholder="请输入关键词" :remote-method="remoteMethod" :loading="loading"
                                     @keyup.enter.native="remoteMethod(formData.location)">
                                     <el-option v-for="(item, index) in searchOptions" @click.native="handleClickKey(index)"
@@ -81,7 +81,7 @@
                     </el-form-item>
 
                     <el-form-item label="详细地址" prop="address" label-width="150px" style="display: block">
-                        <el-input class="cell-width-1" v-model="formData.address">
+                        <el-input class="cell-width-1" v-model.trim="formData.address">
                         </el-input>
                     </el-form-item>
                 </el-form>
@@ -101,7 +101,7 @@
                         </el-select>
                     </el-form-item>
                     <el-form-item label="居民" label-width="150px" prop="selPersonIndex">
-                        <el-select v-model="selPersonIndex" class="cell-width-1" filterable placeholder="请选择" clearable>
+                        <el-select v-model.trim="selPersonIndex" class="cell-width-1" filterable placeholder="请选择" clearable>
                             <el-option v-for="(item, index) in demandUserList" :key="item.demandUserId" :label="item.label"
                                 :value="index">
                             </el-option>
diff --git a/src/views/modules/shequzhili/eventOld/cpts/myCascader.vue b/src/views/modules/shequzhili/eventOld/cpts/myCascader.vue
index 278d6a138..cf1deecb5 100644
--- a/src/views/modules/shequzhili/eventOld/cpts/myCascader.vue
+++ b/src/views/modules/shequzhili/eventOld/cpts/myCascader.vue
@@ -2,7 +2,7 @@
     <div>
         <el-form :model="form">
             <el-form-item>
-                <el-cascader class="cell-width-2" ref="myCascader" v-model="form.selCategoryArray" :key="iscascaderShow"
+                <el-cascader class="cell-width-2" ref="myCascader" v-model.trim="form.selCategoryArray" :key="iscascaderShow"
                     :options="casOptions" :props="optionProps" :show-all-levels="false" clearable
                     @change="handleChangeCate"></el-cascader>
             </el-form-item>
diff --git a/src/views/modules/shequzhili/eventOld/cpts/process-form-demand.vue b/src/views/modules/shequzhili/eventOld/cpts/process-form-demand.vue
index ac4eed081..27e2ed482 100644
--- a/src/views/modules/shequzhili/eventOld/cpts/process-form-demand.vue
+++ b/src/views/modules/shequzhili/eventOld/cpts/process-form-demand.vue
@@ -6,7 +6,7 @@
                     prop="categoryId">
         <el-cascader class="cell-width-2"
                      ref="myCascader"
-                     v-model="selCategoryArray"
+                     v-model.trim="selCategoryArray"
                      :key="iscascaderShow"
                      :options="casOptions"
                      :props="optionProps"
@@ -15,7 +15,7 @@
       </el-form-item> -->
             <el-form-item label="服务内容" label-width="150px" :class="{ 'form-item': source === 'visiual' }" prop="content">
                 <div :class="{ 'visiual-form': source === 'visiual' }">
-                    <el-input v-model="formData.content" :autosize="{ minRows: 2, maxRows: 10 }" type="textarea" clearable
+                    <el-input v-model.trim="formData.content" :autosize="{ minRows: 2, maxRows: 10 }" type="textarea" clearable
                         class="cell-width-area" placeholder="请输入内容"></el-input>
                 </div>
             </el-form-item>
@@ -24,7 +24,7 @@
                 prop="categoryCode">
                 <div :class="{ 'visiual-form': source === 'visiual' }">
 
-                    <el-cascader v-model="formData.categoryCode" :options="demandOptions" clearable class="cell-width-1"
+                    <el-cascader v-model.trim="formData.categoryCode" :options="demandOptions" clearable class="cell-width-1"
                         @change="handleCateSlect"></el-cascader>
                 </div>
 
@@ -33,7 +33,7 @@
             <el-form-item label="服务时间" label-width="150px" :class="{ 'form-item': source === 'visiual' }"
                 prop="wantServiceTime">
                 <div :class="{ 'visiual-form': source === 'visiual' }">
-                    <el-date-picker v-model="formData.wantServiceTime" type="datetime" class="cell-width-1" clearable
+                    <el-date-picker v-model.trim="formData.wantServiceTime" type="datetime" class="cell-width-1" clearable
                         value-format="yyyy-MM-dd HH:mm:ss" placeholder="选择日期时间">
                     </el-date-picker>
                 </div>
@@ -42,14 +42,14 @@
             <el-form-item label="需求人" label-width="150px" :class="{ 'form-item': source === 'visiual' }"
                 prop="demandUserName">
                 <div :class="{ 'visiual-form': source === 'visiual' }">
-                    <el-input v-model="formData.demandUserName" class="cell-width-1"></el-input>
+                    <el-input v-model.trim="formData.demandUserName" class="cell-width-1"></el-input>
                 </div>
 
             </el-form-item>
             <el-form-item label="联系电话" label-width="150px" :class="{ 'form-item': source === 'visiual' }"
                 prop="demandUserMobile">
                 <div :class="{ 'visiual-form': source === 'visiual' }">
-                    <el-input v-model="formData.demandUserMobile" class="cell-width-1"></el-input>
+                    <el-input v-model.trim="formData.demandUserMobile" class="cell-width-1"></el-input>
                 </div>
 
             </el-form-item>
@@ -57,7 +57,7 @@
                 label-width="150px" style="display: block">
 
                 <div :class="{ 'visiual-form': source === 'visiual' }">
-                    <el-input class="cell-width-1" v-model="formData.serviceLocation">
+                    <el-input class="cell-width-1" v-model.trim="formData.serviceLocation">
                     </el-input>
                 </div>
 
@@ -72,7 +72,7 @@
                         </div>
                         <div class="div_searchmap">
                             <el-input class="cell-width-map" maxlength="50" size="mini" placeholder="请输入关键字"
-                                v-model="keyWords">
+                                v-model.trim="keyWords">
                             </el-input>
                             <el-button style="margin-left: 10px" type="primary" size="mini"
                                 @click="handleSearchMap">查询</el-button>
@@ -84,13 +84,13 @@
             <el-input class="item_width_3"
                       maxlength="50"
                       placeholder="请输入经度"
-                      v-model="formData.longitude">
+                      v-model.trim="formData.longitude">
             </el-input>
             <span style="margin-left: 20px">纬度</span>
             <el-input class="item_width_3"
                       maxlength="50"
                       placeholder="请输入纬度"
-                      v-model="formData.latitude">
+                      v-model.trim="formData.latitude">
             </el-input>
           </div> -->
                 </div>
@@ -99,7 +99,7 @@
             <el-form-item label="门牌号" :class="{ 'form-item': source === 'visiual' }" label-width="150px"
                 prop="locationDetail">
                 <div :class="{ 'visiual-form': source === 'visiual' }">
-                    <el-input v-model="formData.locationDetail" class="cell-width-1"></el-input>
+                    <el-input v-model.trim="formData.locationDetail" class="cell-width-1"></el-input>
                 </div>
 
             </el-form-item>
@@ -108,14 +108,14 @@
 
                 <template>
                     <div :class="[{ 'single-select': source === 'visiual' }, 'sel-service']">
-                        <el-select v-model="formData.serviceType" class="cell-width-1" placeholder="请选择" clearable
+                        <el-select v-model.trim="formData.serviceType" class="cell-width-1" placeholder="请选择" clearable
                             @change="handleServiceChange('add', $event)">
                             <el-option v-for="item in serviceOptions" :key="item.value" :label="item.label"
                                 :value="item.value">
                             </el-option>
                         </el-select>
                         -
-                        <el-select v-model="formData.serverId" class="cell-width-1" filterable placeholder="请选择" clearable>
+                        <el-select v-model.trim="formData.serverId" class="cell-width-1" filterable placeholder="请选择" clearable>
                             <el-option v-for="item in serviceOptiondList" :key="item.id" :label="item.name"
                                 :value="item.id">
                             </el-option>
diff --git a/src/views/modules/shequzhili/eventOld/cpts/process-form-designate.vue b/src/views/modules/shequzhili/eventOld/cpts/process-form-designate.vue
index 1c17b179b..be3cd8530 100644
--- a/src/views/modules/shequzhili/eventOld/cpts/process-form-designate.vue
+++ b/src/views/modules/shequzhili/eventOld/cpts/process-form-designate.vue
@@ -12,20 +12,20 @@
             <el-form-item label="事件分类" label-width="150px" :class="{ 'form-item': source === 'visiual' }"
                 prop="categoryList">
                 <div :class="{ 'visiual-form': source === 'visiual' }">
-                    <el-cascader class="cell-width-2" ref="myCascader" v-model="selCategoryArray" :key="iscascaderShow"
+                    <el-cascader class="cell-width-2" ref="myCascader" v-model.trim="selCategoryArray" :key="iscascaderShow"
                         :options="casOptions" :props="optionProps" :show-all-levels="false" clearable
                         @change="handleChangeCate"></el-cascader>
                 </div>
             </el-form-item>
             <el-form-item label="处理部门" prop="deptId" label-width="150px" :class="{ 'form-item': source === 'visiual' }">
-                <el-cascader class="cell-width-2" ref="agencyIdArray" v-model="agencyIdArray" :options="orgOptions"
+                <el-cascader class="cell-width-2" ref="agencyIdArray" v-model.trim="agencyIdArray" :options="orgOptions"
                     :props="orgOptionProps" :show-all-levels="false" @change="handleChangeAgency"></el-cascader>
             </el-form-item>
             <el-form-item label="转办意见" prop="content" label-width="150px" :class="{ 'form-item': source === 'visiual' }"
                 style="display: block">
                 <div :class="{ 'visiual-form': source === 'visiual' }">
                     <el-input class="cell-width-area" type="textarea" maxlength="500" show-word-limit :rows="5"
-                        placeholder="请输入转办意见，不超过500字" v-model="formData.content"></el-input>
+                        placeholder="请输入转办意见，不超过500字" v-model.trim="formData.content"></el-input>
                 </div>
             </el-form-item>
             <el-form-item style="display: block" label="附件" label-width="150px" prop="attach">
@@ -40,7 +40,7 @@
             <el-form-item label="办结时限" prop="timeLimit" label-width="150px" :class="{ 'form-item': source === 'visiual' }"
                 style="display: block">
                 <div :class="{ 'visiual-form': source === 'visiual' }">
-                    <el-date-picker v-model="formData.timeLimit" class="cell-width-1" type="datetime" placeholder="办结时限"
+                    <el-date-picker v-model.trim="formData.timeLimit" class="cell-width-1" type="datetime" placeholder="办结时限"
                         value-format="yyyy-MM-dd HH:mm:ss">
                     </el-date-picker>
                 </div>
diff --git a/src/views/modules/shequzhili/eventOld/cpts/process-form-issue.vue b/src/views/modules/shequzhili/eventOld/cpts/process-form-issue.vue
index e6f72f749..8776753ab 100644
--- a/src/views/modules/shequzhili/eventOld/cpts/process-form-issue.vue
+++ b/src/views/modules/shequzhili/eventOld/cpts/process-form-issue.vue
@@ -12,13 +12,13 @@
         <div :class="{'visiual-form':source==='visiual'}">
           <!-- <el-cascader class="cell-width-2"
                        ref="myCascader"
-                       v-model="selCategoryArray"
+                       v-model.trim="selCategoryArray"
                        :key="iscascaderShow"
                        :options="casOptions"
                        :props="optionProps"
                        :show-all-levels="false"
                        @change="handleChangeCate"></el-cascader> -->
-                       <my-cascader v-model="formData.categoryList"
+                       <my-cascader v-model.trim="formData.categoryList"
             :casOptions="casOptions"
             :optionProps="optionProps"
             @handleChangeCate="handleChangeCate">
@@ -32,7 +32,7 @@
                     :class="{'form-item':source==='visiual'}"
                     style="display: block">
         <div :class="{'visiual-form':source==='visiual'}">
-          <el-input v-model="formData.issueTitle"
+          <el-input v-model.trim="formData.issueTitle"
                     class="cell-width-2"
                     clearable
                     placeholder="请输入议题标题">
@@ -52,7 +52,7 @@
                     show-word-limit
                     :rows="5"
                     placeholder="请输入处理意见，不超过500字"
-                    v-model="formData.suggestion"></el-input>
+                    v-model.trim="formData.suggestion"></el-input>
         </div>
 
       </el-form-item>
diff --git a/src/views/modules/shequzhili/eventOld/cpts/process-form-project.vue b/src/views/modules/shequzhili/eventOld/cpts/process-form-project.vue
index 925550fae..01e677a5d 100644
--- a/src/views/modules/shequzhili/eventOld/cpts/process-form-project.vue
+++ b/src/views/modules/shequzhili/eventOld/cpts/process-form-project.vue
@@ -12,7 +12,7 @@
         <div :class="{'visiual-form':source==='visiual'}">
           <el-cascader class="cell-width-2"
                        ref="myCascader"
-                       v-model="selCategoryArray"
+                       v-model.trim="selCategoryArray"
                        :key="iscascaderShow"
                        :options="casOptions"
                        :props="optionProps"
@@ -29,7 +29,7 @@
           <el-input class="cell-width-1"
                     maxlength="50"
                     placeholder="请输入项目标题"
-                    v-model="formData.title">
+                    v-model.trim="formData.title">
           </el-input>
         </div>
       </el-form-item>
@@ -60,7 +60,7 @@
         <el-popover placement="bottom"
                     width="400"
                     height="400"
-                    v-model="visibleStaffPanel">
+                    v-model.trim="visibleStaffPanel">
           <div class="f">
             <select-staff @confirm="(ret) => (formData.staffList = ret)"
                           @close="visibleStaffPanel = false" />
@@ -101,7 +101,7 @@
                     class="cell-width-area"
                     :rows="2"
                     placeholder="请输入项目方案"
-                    v-model="formData.publicReply">
+                    v-model.trim="formData.publicReply">
           </el-input>
         </div>
       </el-form-item>
@@ -115,7 +115,7 @@
                     class="cell-width-area"
                     :rows="2"
                     placeholder="请输入内部备注"
-                    v-model="formData.internalRemark">
+                    v-model.trim="formData.internalRemark">
           </el-input>
         </div>
       </el-form-item>
@@ -157,12 +157,12 @@
         <el-popover placement="top"
                     width="450"
                     height="450"
-                    v-model="visibleTagPanel">
+                    v-model.trim="visibleTagPanel">
           <div class="f"
                style="min-height: 120px">
             <h2>选择标签</h2>
             <el-select style="width: 350px"
-                       v-model="selectedTagData"
+                       v-model.trim="selectedTagData"
                        multiple
                        allow-create
                        filterable
diff --git a/src/views/modules/shequzhili/eventOld/cpts/process-form-replay-end.vue b/src/views/modules/shequzhili/eventOld/cpts/process-form-replay-end.vue
index a7ad2654f..a7f6ca5cb 100644
--- a/src/views/modules/shequzhili/eventOld/cpts/process-form-replay-end.vue
+++ b/src/views/modules/shequzhili/eventOld/cpts/process-form-replay-end.vue
@@ -13,7 +13,7 @@
             <el-form-item label="事件分类" label-width="150px" :class="{ 'form-item': source === 'visiual' }"
                 prop="categoryList">
                 <div :class="{ 'visiual-form': source === 'visiual' }">
-                    <el-cascader class="cell-width-2" ref="myCascader" v-model="selCategoryArray" :key="iscascaderShow"
+                    <el-cascader class="cell-width-2" ref="myCascader" v-model.trim="selCategoryArray" :key="iscascaderShow"
                         :options="casOptions" :props="optionProps" :show-all-levels="false" clearable
                         @change="handleChangeCate"></el-cascader>
                 </div>
@@ -22,7 +22,7 @@
                 style="display: block">
                 <div :class="{ 'visiual-form': source === 'visiual' }">
                     <el-input class="cell-width-area" type="textarea" maxlength="500" show-word-limit :rows="5"
-                        placeholder="请输入回复内容，不超过500字" v-model="formData.content"></el-input>
+                        placeholder="请输入回复内容，不超过500字" v-model.trim="formData.content"></el-input>
                 </div>
             </el-form-item>
             <el-form-item style="display: block" label="附件" label-width="150px" prop="attach">
diff --git a/src/views/modules/shequzhili/eventOld/cpts/process-form-replay.vue b/src/views/modules/shequzhili/eventOld/cpts/process-form-replay.vue
index d05ec002d..f7e8b88aa 100644
--- a/src/views/modules/shequzhili/eventOld/cpts/process-form-replay.vue
+++ b/src/views/modules/shequzhili/eventOld/cpts/process-form-replay.vue
@@ -4,7 +4,7 @@
             <el-form-item label="事件分类" label-width="150px" :class="{ 'form-item': source === 'visiual' }"
                 prop="categoryList">
                 <div :class="{ 'visiual-form': source === 'visiual' }">
-                    <el-cascader class="cell-width-2" ref="myCascader" v-model="selCategoryArray" :key="iscascaderShow"
+                    <el-cascader class="cell-width-2" ref="myCascader" v-model.trim="selCategoryArray" :key="iscascaderShow"
                         :options="casOptions" :props="optionProps" :show-all-levels="false" clearable
                         @change="handleChangeCate"></el-cascader>
                 </div>
@@ -13,13 +13,13 @@
                 style="display: block">
                 <div :class="{ 'visiual-form': source === 'visiual' }">
                     <el-input class="cell-width-area" type="textarea" maxlength="500" show-word-limit :rows="5"
-                        placeholder="请输入回复内容，不超过500字" v-model="formData.content"></el-input>
+                        placeholder="请输入回复内容，不超过500字" v-model.trim="formData.content"></el-input>
                 </div>
             </el-form-item>
             <el-form-item label="办结时限" prop="timeLimit" label-width="150px" :class="{ 'form-item': source === 'visiual' }"
                 style="display: block">
                 <div :class="{ 'visiual-form': source === 'visiual' }">
-                    <el-date-picker v-model="formData.timeLimit" class="cell-width-1" type="datetime" placeholder="办结时限"
+                    <el-date-picker v-model.trim="formData.timeLimit" class="cell-width-1" type="datetime" placeholder="办结时限"
                         value-format="yyyy-MM-dd HH:mm:ss">
                     </el-date-picker>
                 </div>
diff --git a/src/views/modules/shequzhili/eventOld/cpts/process-form-urban.vue b/src/views/modules/shequzhili/eventOld/cpts/process-form-urban.vue
index 1a5f5d4bc..cac8cfec5 100644
--- a/src/views/modules/shequzhili/eventOld/cpts/process-form-urban.vue
+++ b/src/views/modules/shequzhili/eventOld/cpts/process-form-urban.vue
@@ -17,7 +17,7 @@
                       show-word-limit
                       :rows="5"
                       placeholder="请输入处理意见，不超过500字"
-                      v-model="formData.suggestion"></el-input>
+                      v-model.trim="formData.suggestion"></el-input>
           </div>
   
         </el-form-item>
diff --git a/src/views/modules/shequzhili/eventOld/cpts/process-form.vue b/src/views/modules/shequzhili/eventOld/cpts/process-form.vue
index f8ff1c132..3522bc207 100644
--- a/src/views/modules/shequzhili/eventOld/cpts/process-form.vue
+++ b/src/views/modules/shequzhili/eventOld/cpts/process-form.vue
@@ -4,7 +4,7 @@
             <el-form ref="ref_form1" :inline="false" :rules="dataRule" class="form">
                 <el-form-item label="处理方式" label-width="150px" :class="{ 'form-item': source === 'visiual' }"
                     prop="operationType">
-                    <el-radio-group :class="{ 'form-item': source === 'visiual' }" v-model="operationType"
+                    <el-radio-group :class="{ 'form-item': source === 'visiual' }" v-model.trim="operationType"
                         @change="handleChangeOperationType">
                         <el-radio v-if="!eventId" label="4">待处理</el-radio>
                         <el-radio label="0">回复</el-radio>
diff --git a/src/views/modules/shequzhili/eventOld/eventList.vue b/src/views/modules/shequzhili/eventOld/eventList.vue
index ea68aa8b5..e748133cc 100644
--- a/src/views/modules/shequzhili/eventOld/eventList.vue
+++ b/src/views/modules/shequzhili/eventOld/eventList.vue
@@ -8,7 +8,7 @@
                             <el-cascader class="u-item-width-normal"
                                 size="small"
                                 ref="myCascader"
-                                v-model="formData.agencyId"
+                                v-model.trim="formData.agencyId"
                                 :options="orgOptions"
                                 :props="orgOptionProps"
                                 :show-all-levels="false"
@@ -16,7 +16,7 @@
                                 clearable></el-cascader>
                         </el-form-item>
                         <el-form-item label="上报渠道" prop="sourceType">
-                            <el-select v-model="formData.sourceType" placeholder="请选择" size="small" clearable
+                            <el-select v-model.trim="formData.sourceType" placeholder="请选择" size="small" clearable
                                 class="u-item-width-normal">
                                 <el-option v-for="item in qudaoArray" :key="item.value" :label="item.label"
                                     :value="item.value">
@@ -24,12 +24,12 @@
                             </el-select>
                         </el-form-item>
                         <el-form-item label="事件内容" prop="eventContent">
-                            <el-input v-model="formData.eventContent" class="u-item-width-normal" size="small" clearable
+                            <el-input v-model.trim="formData.eventContent" class="u-item-width-normal" size="small" clearable
                                 placeholder="请输入">
                             </el-input>
                         </el-form-item>
                         <el-form-item label="事件类型" prop="firstIdList">
-                            <el-cascader ref="cascaderEvent" v-model="eventTypeCheck" :options="cateOptions" collapse-tags
+                            <el-cascader ref="cascaderEvent" v-model.trim="eventTypeCheck" :options="cateOptions" collapse-tags
                                 :show-all-levels="false" :props="optionProps" clearable class="u-item-width-normal" @change="handleEventType" />
                             <!-- <template slot-scope="{ node, data }">
                   <div @click="cascaderClick(node, data)">
@@ -39,29 +39,29 @@
               </el-cascader> -->
                         </el-form-item>
                         <el-form-item label="上报人" prop="name">
-                            <el-input v-model="formData.name" class="u-item-width-normal" size="small" clearable
+                            <el-input v-model.trim="formData.name" class="u-item-width-normal" size="small" clearable
                                 placeholder="请输入">
                             </el-input>
                         </el-form-item>
                         <el-form-item label="联系电话" prop="mobile">
-                            <el-input v-model="formData.mobile" class="u-item-width-normal" size="small" clearable
+                            <el-input v-model.trim="formData.mobile" class="u-item-width-normal" size="small" clearable
                                 placeholder="请输入">
                             </el-input>
                         </el-form-item>
                         <el-form-item label="上报时间" prop="startTime">
-                            <el-date-picker v-model="formData.startTime" :picker-options="startPickerOptions"
+                            <el-date-picker v-model.trim="formData.startTime" :picker-options="startPickerOptions"
                                 class="u-item-width-daterange" size="small" type="date" value-format="yyyy-MM-dd HH:mm:ss"
                                 value="yyyy-MM-dd" placeholder="开始时间">
                             </el-date-picker>
                             <span class="u-data-tag">至</span>
-                            <el-date-picker v-model="formData.endTime" :picker-options="endPickerOptions"
+                            <el-date-picker v-model.trim="formData.endTime" :picker-options="endPickerOptions"
                                 class="u-item-width-daterange u-data-tag" size="small" type="date"
                                 value-format="yyyy-MM-dd HH:mm:ss" value="yyyy-MM-dd" placeholder="结束时间">
                             </el-date-picker>
                         </el-form-item>
 
                         <el-form-item label="状态" prop="status">
-                            <el-select class="u-item-width-normal" v-model="formData.status" placeholder="全部" size="small"
+                            <el-select class="u-item-width-normal" v-model.trim="formData.status" placeholder="全部" size="small"
                                 clearable>
                                 <el-option v-for="item in statusArray" :key="item.value" :label="item.label"
                                     :value="item.value">
@@ -71,7 +71,7 @@
 
 
                         <el-form-item label="标记" prop="type">
-                            <el-select class="u-item-width-normal" v-model="formData.type" placeholder="全部" size="small"
+                            <el-select class="u-item-width-normal" v-model.trim="formData.type" placeholder="全部" size="small"
                                 clearable>
                                 <el-option v-for="item in typeArray" :key="item.value" :label="item.label"
                                     :value="item.value">
diff --git a/src/views/modules/shequzhili/ggfwtc/ggfw.vue b/src/views/modules/shequzhili/ggfwtc/ggfw.vue
index 63a06adef..d410ff8d5 100644
--- a/src/views/modules/shequzhili/ggfwtc/ggfw.vue
+++ b/src/views/modules/shequzhili/ggfwtc/ggfw.vue
@@ -9,7 +9,7 @@
 
           <el-form-item label="场所名称"
                         prop="name">
-            <el-input v-model="formData.name"
+            <el-input v-model.trim="formData.name"
                       class="item_width_1"
                       clearable
                       size="small"
@@ -20,7 +20,7 @@
           <el-form-item label="场所分类"
                         prop="serviceMatter">
             <el-select class="item_width_1"
-                       v-model="formData.category"
+                       v-model.trim="formData.category"
                        placeholder="请选择"
                        size="small"
                        clearable>
diff --git a/src/views/modules/shequzhili/ggfwtc/ggfwForm.vue b/src/views/modules/shequzhili/ggfwtc/ggfwForm.vue
index 500ca9a7b..9a4aeade8 100644
--- a/src/views/modules/shequzhili/ggfwtc/ggfwForm.vue
+++ b/src/views/modules/shequzhili/ggfwtc/ggfwForm.vue
@@ -17,7 +17,7 @@
                     maxlength="50"
                     show-word-limit
                     placeholder="请输入场所名称"
-                    v-model="formData.name">
+                    v-model.trim="formData.name">
           </el-input>
         </el-form-item>
         <el-form-item label="场所类型"
@@ -25,7 +25,7 @@
                       label-width="150px"
                       style="display: block">
           <el-select class="item_width_1"
-                     v-model="formData.category"
+                     v-model.trim="formData.category"
                      placeholder="请选择"
                      filterable
                      clearable>
@@ -43,7 +43,7 @@
                       prop="areaCovered"
                       label-width="150px">
           <el-input-number class="item_width_4"
-                           v-model="formData.areaCovered"
+                           v-model.trim="formData.areaCovered"
                            :precision="2"
                            :step="0.01"
                            :min="0"
@@ -55,7 +55,7 @@
                       prop="capacity"
                       label-width="150px">
           <el-input-number class="item_width_4"
-                           v-model="formData.capacity"
+                           v-model.trim="formData.capacity"
                            :min="0"
                            :max="9999"
                            label="容纳人数"></el-input-number>
@@ -65,7 +65,7 @@
                       style="display: block"
                       label-width="150px"
                       prop="principal">
-          <el-input v-model="formData.principal"
+          <el-input v-model.trim="formData.principal"
                     class="item_width_1"
                     placeholder="请输入负责人姓名"></el-input>
         </el-form-item>
@@ -73,7 +73,7 @@
                       style="display: block"
                       label-width="150px"
                       prop="mobile">
-          <el-input v-model="formData.mobile"
+          <el-input v-model.trim="formData.mobile"
                     class="item_width_1"
                     placeholder="请输入联系电话"></el-input>
         </el-form-item>
@@ -82,7 +82,7 @@
                       label-width="150px"
                       style="display: block">
           <div style="width: 500px">
-            <el-select v-model="searchValue"
+            <el-select v-model.trim="searchValue"
                        filterable
                        style="width: 500px"
                        remote
@@ -110,7 +110,7 @@
                     maxlength="50"
                     show-word-limit
                     placeholder="请输入位置	"
-                    v-model="formData.address">
+                    v-model.trim="formData.address">
           </el-input>
         </el-form-item>
       </el-form>
diff --git a/src/views/modules/shequzhili/issue/cpts/add.vue b/src/views/modules/shequzhili/issue/cpts/add.vue
index f55f33af5..ce24e8d63 100644
--- a/src/views/modules/shequzhili/issue/cpts/add.vue
+++ b/src/views/modules/shequzhili/issue/cpts/add.vue
@@ -41,7 +41,7 @@
               class="cell-width-1"
               maxlength="10"
               placeholder="请输入报事人姓名"
-              v-model="formData.name"
+              v-model.trim="formData.name"
             >
             </el-input>
             <div>
@@ -64,7 +64,7 @@
               class="cell-width-1"
               maxlength="30"
               placeholder="请输入联系电话	"
-              v-model="formData.mobile"
+              v-model.trim="formData.mobile"
             >
             </el-input>
           </el-form-item>
@@ -79,13 +79,13 @@
               class="cell-width-1"
               maxlength="30"
               placeholder="请输入证件号"
-              v-model="formData.idCard"
+              v-model.trim="formData.idCard"
             ></el-input>
           </el-form-item>
 
           <el-form-item label="反应渠道" label-width="150px" prop="sourceType">
             <el-select
-              v-model="formData.sourceType"
+              v-model.trim="formData.sourceType"
               placeholder="请选择"
               size="small"
               clearable
@@ -108,7 +108,7 @@
             style="display: block"
           >
             <el-date-picker
-              v-model="formData.happenTime"
+              v-model.trim="formData.happenTime"
               class="cell-width-1"
               type="datetime"
               placeholder="发生时间"
@@ -130,7 +130,7 @@
               show-word-limit
               :rows="5"
               placeholder="请输入事件内容，不超过500字"
-              v-model="formData.eventContent"
+              v-model.trim="formData.eventContent"
             ></el-input>
           </el-form-item>
         </el-form>
@@ -170,7 +170,7 @@
             label-width="150px"
             style="display: block"
           >
-            <el-input class="cell-width-1" v-model="formData.address">
+            <el-input class="cell-width-1" v-model.trim="formData.address">
             </el-input>
           </el-form-item>
           <el-form-item
@@ -188,7 +188,7 @@
                     maxlength="50"
                     size="mini"
                     placeholder="请输入关键字"
-                    v-model="keyWords"
+                    v-model.trim="keyWords"
                   >
                   </el-input>
                   <el-button
@@ -206,13 +206,13 @@
                 <el-input class="item_width_3"
                           maxlength="50"
                           placeholder="请输入经度"
-                          v-model="formData.longitude">
+                          v-model.trim="formData.longitude">
                 </el-input>
                 <span style="margin-left: 20px">纬度</span>
                 <el-input class="item_width_3"
                           maxlength="50"
                           placeholder="请输入纬度"
-                          v-model="formData.latitude">
+                          v-model.trim="formData.latitude">
                 </el-input>
               </div> -->
             </div>
@@ -254,7 +254,7 @@
           </el-form-item>
           <el-form-item label="居民" label-width="150px" prop="selPersonIndex">
             <el-select
-              v-model="selPersonIndex"
+              v-model.trim="selPersonIndex"
               class="cell-width-1"
               filterable
               placeholder="请选择"
diff --git a/src/views/modules/shequzhili/issue/cpts/issue-detail.vue b/src/views/modules/shequzhili/issue/cpts/issue-detail.vue
index c66d62faf..1182ecf0b 100644
--- a/src/views/modules/shequzhili/issue/cpts/issue-detail.vue
+++ b/src/views/modules/shequzhili/issue/cpts/issue-detail.vue
@@ -117,12 +117,12 @@
               placement="bottom"
               width="400"
               height="400"
-              v-model="visibleCatePanel"
+              v-model.trim="visibleCatePanel"
             >
               <div class="f" style="min-height: 120px">
                 <h2>更改分类</h2>
                 <el-cascader
-                  v-model="selectedCateData"
+                  v-model.trim="selectedCateData"
                   :options="cateOptions"
                   :props="{
                     multiple: true,
@@ -168,12 +168,12 @@
               placement="bottom"
               width="450"
               height="400"
-              v-model="visibleTagPanel"
+              v-model.trim="visibleTagPanel"
             >
               <div class="f" style="min-height: 120px">
                 <h2>更改标签</h2>
                 <el-select
-                  v-model="selectedTagData"
+                  v-model.trim="selectedTagData"
                   multiple
                   allow-create
                   filterable
diff --git a/src/views/modules/shequzhili/issue/cpts/process-form.vue b/src/views/modules/shequzhili/issue/cpts/process-form.vue
index 0290a26a8..a54f72149 100644
--- a/src/views/modules/shequzhili/issue/cpts/process-form.vue
+++ b/src/views/modules/shequzhili/issue/cpts/process-form.vue
@@ -11,7 +11,7 @@
                       :class="{'form-item':source==='visiual'}"
                       prop="operationType">
           <el-radio-group :class="{'form-item':source==='visiual'}"
-                          v-model="operationType"
+                          v-model.trim="operationType"
                           @change="handleChangeOperationType">
 
             <el-radio label="0">转项目</el-radio>
@@ -34,7 +34,7 @@
             <el-popover placement="bottom"
                         width="400"
                         height="400"
-                        v-model="visibleStaffPanel">
+                        v-model.trim="visibleStaffPanel">
               <div class="f">
                 <select-staff @confirm="(ret) => (project.staffList = ret)"
                               @close="visibleStaffPanel = false" />
@@ -59,7 +59,7 @@
                         show-word-limit
                         :rows="5"
                         placeholder="请输入项目方案，不超过500字"
-                        v-model="project.publicReply"></el-input>
+                        v-model.trim="project.publicReply"></el-input>
             </div>
 
           </el-form-item>
@@ -75,7 +75,7 @@
                         show-word-limit
                         :rows="5"
                         placeholder="请输入内部备注，不超过500字"
-                        v-model="project.internalRemark"></el-input>
+                        v-model.trim="project.internalRemark"></el-input>
             </div>
 
           </el-form-item>
@@ -93,7 +93,7 @@
                         :class="{'form-item':source==='visiual'}"
                         prop="resolveType">
             <el-radio-group :class="{'form-item':source==='visiual'}"
-                            v-model="closedInfo.resolveType">
+                            v-model.trim="closedInfo.resolveType">
 
               <el-radio label="resolved">已解决</el-radio>
               <el-radio label="unresolved">无需解决</el-radio>
@@ -112,7 +112,7 @@
                         show-word-limit
                         :rows="5"
                         placeholder="请输入关闭原因，不超过500字"
-                        v-model="closedInfo.closeReason"></el-input>
+                        v-model.trim="closedInfo.closeReason"></el-input>
             </div>
 
           </el-form-item>
diff --git a/src/views/modules/shequzhili/issue/cptsAudit/process-form.vue b/src/views/modules/shequzhili/issue/cptsAudit/process-form.vue
index 8e1745bc5..aa6e99a0e 100644
--- a/src/views/modules/shequzhili/issue/cptsAudit/process-form.vue
+++ b/src/views/modules/shequzhili/issue/cptsAudit/process-form.vue
@@ -11,7 +11,7 @@
                       :class="{'form-item':source==='visiual'}"
                       prop="actionType">
           <el-radio-group :class="{'form-item':source==='visiual'}"
-                          v-model="auditInfo.actionType">
+                          v-model.trim="auditInfo.actionType">
 
             <el-radio label="approved">通过</el-radio>
             <el-radio label="rejected">驳回</el-radio>
@@ -30,7 +30,7 @@
                       show-word-limit
                       :rows="5"
                       placeholder="请输入理由，不超过500字"
-                      v-model="auditInfo.reason"></el-input>
+                      v-model.trim="auditInfo.reason"></el-input>
           </div>
 
         </el-form-item>
diff --git a/src/views/modules/shequzhili/issue/issueAuditList.vue b/src/views/modules/shequzhili/issue/issueAuditList.vue
index fc4679587..eb79beb7c 100644
--- a/src/views/modules/shequzhili/issue/issueAuditList.vue
+++ b/src/views/modules/shequzhili/issue/issueAuditList.vue
@@ -6,32 +6,32 @@
                     <div>
 
                         <el-form-item label="所属组织" prop="orgId">
-                            <el-cascader class="u-item-width-normal" ref="myCascader" size="small" v-model="agencyIdArray"
+                            <el-cascader class="u-item-width-normal" ref="myCascader" size="small" v-model.trim="agencyIdArray"
                                 :options="orgOptions" :props="orgOptionProps" :show-all-levels="false"
                                 @change="handleChangeAgency"></el-cascader>
 
                         </el-form-item>
 
                         <el-form-item label="议题标题" prop="issueTitle">
-                            <el-input v-model="formData.issueTitle" class="u-item-width-normal" size="small" clearable
+                            <el-input v-model.trim="formData.issueTitle" class="u-item-width-normal" size="small" clearable
                                 placeholder="请输入">
                             </el-input>
                         </el-form-item>
 
                         <el-form-item label="转议题时间" prop="startTime">
-                            <el-date-picker v-model="formData.startTime" :picker-options="startPickerOptions"
+                            <el-date-picker v-model.trim="formData.startTime" :picker-options="startPickerOptions"
                                 class="u-item-width-daterange" size="small" type="date" value-format="yyyyMMdd"
                                 value="yyyy-MM-dd" placeholder="开始时间">
                             </el-date-picker>
                             <span class="u-data-tag">至</span>
-                            <el-date-picker v-model="formData.endTime" :picker-options="endPickerOptions"
+                            <el-date-picker v-model.trim="formData.endTime" :picker-options="endPickerOptions"
                                 class="u-item-width-daterange u-data-tag" size="small" type="date" value-format="yyyyMMdd"
                                 value="yyyy-MM-dd" placeholder="结束时间">
                             </el-date-picker>
                         </el-form-item>
 
                         <el-form-item label="状态" prop="applyStatus">
-                            <el-select class="u-item-width-normal" v-model="formData.applyStatus" placeholder="全部"
+                            <el-select class="u-item-width-normal" v-model.trim="formData.applyStatus" placeholder="全部"
                                 size="small" clearable>
                                 <el-option v-for="item in statusArray" :key="item.value" :label="item.label"
                                     :value="item.value">
diff --git a/src/views/modules/shequzhili/issue/issueList.vue b/src/views/modules/shequzhili/issue/issueList.vue
index 0f0f03fd6..d876315f9 100644
--- a/src/views/modules/shequzhili/issue/issueList.vue
+++ b/src/views/modules/shequzhili/issue/issueList.vue
@@ -13,7 +13,7 @@
               <el-cascader class="u-item-width-normal"
                            ref="myCascader"
                            size="small"
-                           v-model="agencyIdArray"
+                           v-model.trim="agencyIdArray"
                            :options="orgOptions"
                            :props="orgOptionProps"
                            :show-all-levels="false"
@@ -23,7 +23,7 @@
 
             <el-form-item label="议题标题"
                           prop="issueTitle">
-              <el-input v-model="formData.issueTitle"
+              <el-input v-model.trim="formData.issueTitle"
                         class="u-item-width-normal"
                         size="small"
                         clearable
@@ -33,7 +33,7 @@
 
             <el-form-item label="转议题时间"
                           prop="startTime">
-              <el-date-picker v-model="formData.startTime"
+              <el-date-picker v-model.trim="formData.startTime"
                               :picker-options="startPickerOptions"
                               class="u-item-width-daterange"
                               size="small"
@@ -43,7 +43,7 @@
                               placeholder="开始时间">
               </el-date-picker>
               <span class="u-data-tag">至</span>
-              <el-date-picker v-model="formData.endTime"
+              <el-date-picker v-model.trim="formData.endTime"
                               :picker-options="endPickerOptions"
                               class="u-item-width-daterange u-data-tag"
                               size="small"
@@ -57,7 +57,7 @@
             <el-form-item label="状态"
                           prop="issueStatus">
               <el-select class="u-item-width-normal"
-                         v-model="formData.issueStatus"
+                         v-model.trim="formData.issueStatus"
                          placeholder="全部"
                          size="small"
                          clearable>
diff --git a/src/views/modules/shequzhili/statics/cEvent.vue b/src/views/modules/shequzhili/statics/cEvent.vue
index f19aacb1e..c0373e3eb 100644
--- a/src/views/modules/shequzhili/statics/cEvent.vue
+++ b/src/views/modules/shequzhili/statics/cEvent.vue
@@ -11,7 +11,7 @@
                         label-width="100px"
                         prop="agencyId">
             <el-cascader ref="cascaderUnit"
-                         v-model="dataForm.agencyId"
+                         v-model.trim="dataForm.agencyId"
                          :options="optionsA"
                          :props="{ checkStrictly: true, emitPath: false,children:'subAgencyList',label:'agencyName',value:'agencyId'}"
                          clearable />
@@ -24,7 +24,7 @@
           </el-form-item>
           <el-form-item label="时间范围"
                         prop="startDate">
-            <el-date-picker v-model="timeRange"
+            <el-date-picker v-model.trim="timeRange"
                             type="datetimerange"
                             clearable
                             size="small"
diff --git a/src/views/modules/shequzhili/statics/gridEvent.vue b/src/views/modules/shequzhili/statics/gridEvent.vue
index 92ac97e0b..0cd625b2d 100644
--- a/src/views/modules/shequzhili/statics/gridEvent.vue
+++ b/src/views/modules/shequzhili/statics/gridEvent.vue
@@ -4,7 +4,7 @@
       <el-form ref="searchForm" :inline="true" :model="dataForm" size="small">
         <el-form-item label="所属组织" label-width="100px"
                       prop="orgId">
-          <el-cascader ref="cascaderUnit" v-model="orgId" 
+          <el-cascader ref="cascaderUnit" v-model.trim="orgId" 
           :options="optionsA" 
           :props="{ checkStrictly: true, emitPath: false,children:'subOrgList',label:'orgName'}" 
           clearable 
@@ -18,7 +18,7 @@
         </el-form-item>
         <el-form-item label="时间范围"
                       prop="startDate">
-          <el-date-picker v-model="timeRange"
+          <el-date-picker v-model.trim="timeRange"
                           type="datetimerange"
                           clearable
                           size="small"
diff --git a/src/views/modules/shequzhili/statics/index.vue b/src/views/modules/shequzhili/statics/index.vue
index da0e543d2..f3cad6253 100644
--- a/src/views/modules/shequzhili/statics/index.vue
+++ b/src/views/modules/shequzhili/statics/index.vue
@@ -4,7 +4,7 @@
       <el-form ref="searchForm" :inline="true" :model="dataForm" size="small">
         <el-form-item label="所属组织" label-width="100px"
                       prop="agencyId">
-          <el-cascader ref="cascaderUnit" v-model="dataForm.agencyId" :options="optionsA" :props="{ checkStrictly: true, emitPath: false,children:'subAgencyList',label:'agencyName',value:'agencyId'}" clearable />
+          <el-cascader ref="cascaderUnit" v-model.trim="dataForm.agencyId" :options="optionsA" :props="{ checkStrictly: true, emitPath: false,children:'subAgencyList',label:'agencyName',value:'agencyId'}" clearable />
             <!-- <template slot-scope="{ node, data }">
               <div @click="cascaderClick(data)">
                 <span>{{ data.objectName }}</span>
@@ -14,17 +14,17 @@
         </el-form-item>
         <el-form-item label="统计类型"
                       prop="endTime"  label-width="100px">
-          <el-radio v-model="dataForm.type" label="end" @change="handleRadioCHange">截止累计值</el-radio>
-          <el-radio v-model="dataForm.type" label="Interval" @change="handleRadioCHange">区间新增值</el-radio>     
+          <el-radio v-model.trim="dataForm.type" label="end" @change="handleRadioCHange">截止累计值</el-radio>
+          <el-radio v-model.trim="dataForm.type" label="Interval" @change="handleRadioCHange">区间新增值</el-radio>     
           <el-date-picker v-show="dataForm.type == 'end'" 
-            v-model="dataForm.endTime"
+            v-model.trim="dataForm.endTime"
             type="datetime"
             :clearable="false"
             size="small"
             :picker-options="pickerOptions"
             value-format="yyyy-MM-dd HH:mm:ss" 
           />     
-          <el-date-picker v-show="dataForm.type == 'Interval'" v-model="timeRange"
+          <el-date-picker v-show="dataForm.type == 'Interval'" v-model.trim="timeRange"
             type="datetimerange"
             clearable
             size="small"
diff --git a/src/views/modules/shequzhili/tuceng/anquan/anquanxuncha/addForm.vue b/src/views/modules/shequzhili/tuceng/anquan/anquanxuncha/addForm.vue
index 4785712af..10be9ed4e 100644
--- a/src/views/modules/shequzhili/tuceng/anquan/anquanxuncha/addForm.vue
+++ b/src/views/modules/shequzhili/tuceng/anquan/anquanxuncha/addForm.vue
@@ -11,19 +11,19 @@
 					<el-row>
 						<el-col :span="6">
 							<el-form-item label="场所名称" prop="placeOrgName">
-								<el-input v-model="formData.placeOrgName" :disabled="disabled" class="u-item-width-normal" size="small" clearable placeholder="请输入"></el-input>
+								<el-input v-model.trim="formData.placeOrgName" :disabled="disabled" class="u-item-width-normal" size="small" clearable placeholder="请输入"></el-input>
 							</el-form-item>
 						</el-col>
 						<el-col :span="6">
 							<el-form-item label="占地面积" prop="areaCovered">
-								<el-input v-model="formData.areaCovered" :disabled="disabled" class="u-item-width-normal" size="small" clearable placeholder="请输入"></el-input>
+								<el-input v-model.trim="formData.areaCovered" :disabled="disabled" class="u-item-width-normal" size="small" clearable placeholder="请输入"></el-input>
 							</el-form-item>
 						</el-col>
 						<el-col :span="6">
 							<el-form-item label="场所规模" prop="scaleTotal">
 								<el-input
 									type="number"
-									v-model="formData.scaleTotal"
+									v-model.trim="formData.scaleTotal"
 									:disabled="disabled"
 									class="u-item-width-normal"
 									size="small"
@@ -34,39 +34,39 @@
 						</el-col>
 						<el-col :span="6">
 							<el-form-item label="所属组织" prop="gridId">
-								<el-select v-model="formData.gridId" class="u-item-width-normal" :disabled="disabled" placeholder="全部" size="small" clearable>
+								<el-select v-model.trim="formData.gridId" class="u-item-width-normal" :disabled="disabled" placeholder="全部" size="small" clearable>
 									<el-option v-for="item in gridList" :key="item.value" :label="item.label" :value="item.value"></el-option>
 								</el-select>
 							</el-form-item>
 						</el-col>
 						<el-col :span="6">
 							<el-form-item label="场所类别" prop="placeCategory">
-								<el-select v-model="formData.placeCategory" :disabled="disabled" placeholder="请选择" size="small" clearable class="u-item-width-normal">
+								<el-select v-model.trim="formData.placeCategory" :disabled="disabled" placeholder="请选择" size="small" clearable class="u-item-width-normal">
 									<el-option v-for="item in placeCategoryArray" :key="item.value" :label="item.label" :value="item.value"></el-option>
 								</el-select>
 							</el-form-item>
 						</el-col>
 						<el-col :span="6">
 							<el-form-item label="场所类型" prop="placeType">
-								<el-select class="u-item-width-normal" :disabled="disabled" v-model="formData.placeType" placeholder="全部" size="small" clearable>
+								<el-select class="u-item-width-normal" :disabled="disabled" v-model.trim="formData.placeType" placeholder="全部" size="small" clearable>
 									<el-option v-for="item in placeTypeList" :key="item.value" :label="item.label" :value="item.value"></el-option>
 								</el-select>
 							</el-form-item>
 						</el-col>
 						<el-col :span="6">
 							<el-form-item label="负责人" prop="personInCharge">
-								<el-input v-model="formData.personInCharge" :disabled="disabled" class="u-item-width-normal" size="small" clearable placeholder="请输入"></el-input>
+								<el-input v-model.trim="formData.personInCharge" :disabled="disabled" class="u-item-width-normal" size="small" clearable placeholder="请输入"></el-input>
 							</el-form-item>
 						</el-col>
 						<el-col :span="6">
 							<el-form-item label="联系电话" prop="mobile">
-								<el-input v-model="formData.mobile" :disabled="disabled" class="u-item-width-normal" size="small" clearable placeholder="请输入"></el-input>
+								<el-input v-model.trim="formData.mobile" :disabled="disabled" class="u-item-width-normal" size="small" clearable placeholder="请输入"></el-input>
 							</el-form-item>
 						</el-col>
 						<el-col :span="18">
 							<el-form-item label="场所地址" prop="address" style="display: block">
 								<el-select
-									v-model="formData.address"
+									v-model.trim="formData.address"
 									:disabled="disabled"
 									filterable
 									remote
diff --git a/src/views/modules/shequzhili/tuceng/anquan/anquanxuncha/index.vue b/src/views/modules/shequzhili/tuceng/anquan/anquanxuncha/index.vue
index 0e3252bbb..de2546c34 100644
--- a/src/views/modules/shequzhili/tuceng/anquan/anquanxuncha/index.vue
+++ b/src/views/modules/shequzhili/tuceng/anquan/anquanxuncha/index.vue
@@ -5,38 +5,38 @@
 				<el-form :inline="true" :model="formData" ref="ref_searchform" :label-width="'100px'">
 					<div>
 						<el-form-item label="场所名称" prop="placeOrgName">
-							<el-input v-model="formData.placeOrgName" class="u-item-width-normal" size="small" clearable placeholder="请输入"></el-input>
+							<el-input v-model.trim="formData.placeOrgName" class="u-item-width-normal" size="small" clearable placeholder="请输入"></el-input>
 						</el-form-item>
 						<el-form-item label="场所类别" prop="placeCategory">
-							<el-select v-model="formData.placeCategory" placeholder="请选择" size="small" clearable class="u-item-width-normal">
+							<el-select v-model.trim="formData.placeCategory" placeholder="请选择" size="small" clearable class="u-item-width-normal">
 								<el-option v-for="item in placeCategoryArray" :key="item.value" :label="item.label" :value="item.value"></el-option>
 							</el-select>
 						</el-form-item>
 						<el-form-item label="场所类型" prop="placeType">
-							<el-select class="u-item-width-normal" v-model="formData.placeType" placeholder="全部" size="small" clearable>
+							<el-select class="u-item-width-normal" v-model.trim="formData.placeType" placeholder="全部" size="small" clearable>
 								<el-option v-for="item in placeTypeList" :key="item.value" :label="item.label" :value="item.value"></el-option>
 							</el-select>
 						</el-form-item>
 						<el-form-item label="巡查结果" prop="result">
-							<el-select v-model="formData.result" placeholder="请选择" size="small" clearable class="u-item-width-normal">
+							<el-select v-model.trim="formData.result" placeholder="请选择" size="small" clearable class="u-item-width-normal">
 								<el-option v-for="item in resultArray" :key="item.value" :label="item.label" :value="item.value"></el-option>
 							</el-select>
 						</el-form-item>
 						<el-form-item label="场所规模" prop="scaleTotal">
-							<el-input type="number" v-model="formData.scaleTotal" class="u-item-width-normal" size="small" clearable placeholder="请输入"></el-input>
+							<el-input type="number" v-model.trim="formData.scaleTotal" class="u-item-width-normal" size="small" clearable placeholder="请输入"></el-input>
 						</el-form-item>
 						<el-form-item label="所属组织" prop="gridId">
-							<el-select class="u-item-width-normal" v-model="formData.gridId" placeholder="全部" size="small" clearable>
+							<el-select class="u-item-width-normal" v-model.trim="formData.gridId" placeholder="全部" size="small" clearable>
 								<el-option v-for="item in gridList" :key="item.value" :label="item.label" :value="item.value"></el-option>
 							</el-select>
 						</el-form-item>
 
 						<el-form-item label="场所地址" prop="address">
-							<el-input v-model="formData.address" class="u-item-width-normal" size="small" clearable placeholder="请输入"></el-input>
+							<el-input v-model.trim="formData.address" class="u-item-width-normal" size="small" clearable placeholder="请输入"></el-input>
 						</el-form-item>
 
 						<el-form-item label="负责人" prop="personInCharge">
-							<el-input v-model="formData.personInCharge" class="u-item-width-normal" size="small" clearable placeholder="请输入"></el-input>
+							<el-input v-model.trim="formData.personInCharge" class="u-item-width-normal" size="small" clearable placeholder="请输入"></el-input>
 						</el-form-item>
 
 						<el-row>
diff --git a/src/views/modules/shequzhili/tuceng/anquan/anquanxuncha/record.vue b/src/views/modules/shequzhili/tuceng/anquan/anquanxuncha/record.vue
index 1243a3af8..19fc1360d 100644
--- a/src/views/modules/shequzhili/tuceng/anquan/anquanxuncha/record.vue
+++ b/src/views/modules/shequzhili/tuceng/anquan/anquanxuncha/record.vue
@@ -1,427 +1,429 @@
-<template>
-	<div class="m-record">
-		<h3>检查记录</h3>
-		<div>
-			<!-- <div class="u-table-btn1 mt10" v-if="formType != 'view'">
-				<el-button size="small" class="diy-button--blue" :disabled="btnDisabled || disabled" @click="handleAdd">新增</el-button>
-			</div> -->
-			<div class="m-table-item">
-				<el-table :data="tableData" class="resi-table" row-key="id" border style="width: 100%">
-					<el-table-column label="序号" type="index" align="center" width="50"></el-table-column>
-					<el-table-column prop="patrolTime" label="检查时间" align="center" width="200px">
-						<template slot-scope="scope">
-							<el-date-picker
-								v-if="scope.row.isEdit"
-								v-model="scope.row.patrolTime"
-								type="date"
-								class="input-width"
-								value-format="yyyy-MM-dd"
-								placeholder="选择日期"
-							></el-date-picker>
-							<div v-else class="div-content">{{ scope.row.patrolTime }}</div>
-						</template>
-					</el-table-column>
-					<el-table-column prop="staffId" label="检查人员" align="center" width="200px">
-						<template slot-scope="scope">
-							<el-select
-								v-if="scope.row.isEdit"
-								v-model="scope.row.staffId"
-								placeholder="请选择"
-								class="input-width"
-								@change="handleChangeStaff(scope.row)"
-								clearable
-							>
-								<el-option v-for="subItem in optionStaff" :key="subItem.value" :label="subItem.label" :value="subItem.value"></el-option>
-							</el-select>
-							<div v-else class="div-content">{{ scope.row.staffName }}</div>
-						</template>
-					</el-table-column>
-
-					<el-table-column prop="mobile" label="联系电话" align="center" width="200px">
-						<template slot-scope="scope">
-							<el-input v-if="scope.row.isEdit" type="number" v-model="scope.row.mobile" placeholder="请输入" class="input-width" clearable disabled></el-input>
-							<div v-else class="div-content">{{ scope.row.mobile }}</div>
-						</template>
-					</el-table-column>
-
-					<el-table-column prop="result" label="检查结果" align="center" width="200px">
-						<template slot-scope="scope">
-							<el-select v-if="scope.row.isEdit" v-model="scope.row.result" placeholder="请选择" class="input-width" size="small" clearable>
-								<el-option v-for="subItem in optionResult" :key="subItem.value" :label="subItem.label" :value="subItem.value"></el-option>
-							</el-select>
-							<div v-else class="div-content">{{ scope.row.result == 1 ? '正常' : '异常' }}</div>
-						</template>
-					</el-table-column>
-					<el-table-column prop="detailed" label="隐患明细" align="center" width="200px">
-						<template slot-scope="scope">
-							<el-input
-								v-if="scope.row.isEdit"
-								type="text"
-								v-model="scope.row.detailed"
-								placeholder="请输入"
-								class="input-width"
-								maxlength="500"
-								clearable
-							></el-input>
-							<div v-else class="div-content">{{ scope.row.detailed }}</div>
-						</template>
-					</el-table-column>
-					<el-table-column prop="imgList" label="图片列表" align="center">
-						<template slot-scope="scope">
-							<div v-if="scope.row.isEdit">
-								<el-upload
-								:disabled="scope.row.imgList.length == 3"
-									:headers="$getElUploadHeaders()"
-									class="avatar-uploader"
-									:action="uploadUrl"
-									:data="{ customerId: customerId }"
-									:show-file-list="true"
-									:limit="3"
-									:file-list="scope.row.imgList"
-									:on-success="res => handleImgSuccess(res, scope.row)"
-									:on-remove="res => handleImgRemove(res, scope.row)"
-									list-type="picture"
-									:before-upload="beforeImgUpload"
-								>
-									<div v-if="scope.row.imgList.length != 3"><i class="el-icon-plus avatar-uploader-icon"></i>
-									最多三张图片</div>
-								</el-upload>
-							</div>
-
-							<div v-else class="div-content">
-								<el-image
-									v-if="scope.row.imgList.length > 0"
-									style="width: 100px; height: 50px"
-									:src="scope.row.imgList[0]"
-									fit="cover"
-									:preview-src-list="scope.row.imgList"
-								></el-image>
-							</div>
-						</template>
-					</el-table-column>
-					<el-table-column prop="reviewTime" label="拟复查时间" align="center" width="200px">
-						<template slot-scope="scope">
-							<el-date-picker
-								v-if="scope.row.isEdit"
-								v-model="scope.row.reviewTime"
-								type="date"
-								class="input-width"
-								value-format="yyyy-MM-dd"
-								placeholder="选择日期"
-							></el-date-picker>
-							<div v-else class="div-content">{{ scope.row.reviewTime }}</div>
-						</template>
-					</el-table-column>
-					<el-table-column v-if="!disabled" fixed="right" label="操作" align="center" width="120">
-						<template slot-scope="scope">
-							<template v-if="scope.row.isEdit">
-								<el-button @click="handleEdit(scope.row)" type="text" size="small" class="btn-color-edit">保存</el-button>
-								<el-button @click="handleChange(scope.row, 'cancle')" type="text" size="small" class="btn-color-edit">取消</el-button>
-							</template>
-							<template v-else>
-								<!-- v-if="formType == 'edit'" -->
-								<el-button  @click="handleChange(scope.row, 'edit')" type="text" size="small" :disabled="disabled" class="btn-color-edit">
-									修改
-								</el-button>
-								<el-popconfirm  title="删除之后无法恢复，确认删除？" @onConfirm="del(scope.row)" @confirm="del(scope.row)">
-									<el-button slot="reference" type="text" size="small" class="btn-color-del" style="margin-left: 10px">删除</el-button>
-								</el-popconfirm>
-							</template>
-						</template>
-					</el-table-column>
-				</el-table>
-			</div>
-		</div>
-	</div>
-</template>
-
-<script>
-import { requestPost, requestGet } from '@/js/dai/request';
-export default {
-	props: {
-		id: {
-			type: String,
-			default: ''
-		},
-		info: {
-			type: Object,
-			default: () => ({})
-		},
-		disabled: {
-			type: Boolean,
-			default: false
-		},
-		formType: {
-			type: String,
-			default: ''
-		},
-		source: {
-			//展示来源：manage  管理平台    visiual  可视化平台
-			type: String,
-			default: 'manage'
-		}
-	},
-	data() {
-		return {
-			uploadUrl: window.SITE_CONFIG['apiURL'] + '/oss/file/uploadqrcodeV2',
-			customerId: localStorage.getItem('customerId'),
-
-			btnDisabled: false,
-			btnType: 'cancle',
-			isEdit: false,
-			tableData: [],
-			tempRow: {},
-
-			optionResult: [
-				{
-					label: '异常',
-					value: '0'
-				},
-				{
-					label: '正常',
-					value: '1'
-				}
-			],
-			optionStaff: [
-				// {
-				//   label: "人名",
-				//   value: "inspectStaffId",
-				// },
-			]
-		};
-	},
-
-	computed: {
-		allowOperate() {
-			const {
-				info: { agencyId }
-			} = this;
-			return agencyId && agencyId == this.$store.state.user.agencyId;
-		}
-	},
-
-	watch: {
-		id: {
-			handler(val) {
-				console.log("ddddddddddddd",val)
-				if (val.length > 0) {
-					this.btnDisabled = false;
-					// this.getList();
-				} else this.btnDisabled = true;
-			},
-			immediate: true
-		}
-	},
-
-	created() {
-		this.getOptionStaff();
-		if (this.id) {
-			this.getList();
-		} else {
-			this.handleAdd();
-		}
-	},
-
-	methods: {
-		beforeImgUpload(file) {
-			console.log(file);
-			const isLt1M = file.size / 1024 / 1024 < 10;
-			const srcType = file.type;
-			const format = file.name.split('.').pop();
-
-			if (!isLt1M) {
-				this.$message.error('上传文件大小不能超过 10MB!');
-				return false;
-			}
-			if (srcType.indexOf('image') == -1) {
-				this.$message.error('仅限图片格式');
-				return false;
-			}
-			return true;
-		},
-
-		handleImgSuccess(res, row) {
-			if (res.code === 0 && res.msg === 'success') {
-				row.imgList.push(res.data.url);
-				this.computeImgShowList(row);
-			} else {
-				this.$message.error(res.msg);
-			}
-		},
-
-		computeImgShowList(row) {
-			row.imgShowList = row.imgList.map(url => {
-				return { name: '', url };
-			});
-		},
-
-		handleImgRemove(file, row) {
-			let url = file.url || file.response.data.url;
-			if (url) {
-				row.imgList = row.imgList.filter(item => item !== url);
-				this.computeImgShowList(row);
-			}
-		},
-
-		getRowClass({ rowIndex, columnIndex }) {
-			if (rowIndex === 0) {
-				return 'background: #2195fe; color: #fff;';
-			}
-		},
-
-		handleChange(row, type) {
-			if (type == 'cancle') {
-				row = { ...this.tempRow };
-				row.isEdit = false;
-				if (this.btnType == 'add') this.tableData.pop();
-				this.getList();
-			} else {
-				this.tempRow = { ...row };
-				row.isEdit = true;
-			}
-			this.btnType = type;
-			this.isEdit = !this.isEdit;
-		},
-
-		handleChangeStaff(row) {
-			const { staffId } = row;
-			const { optionStaff } = this;
-			let item = optionStaff.find(item => item.value == staffId);
-			if (item) {
-				row.staffName = item.name;
-				row.mobile = item.mobile;
-			}
-		},
-
-		async getOptionStaff() {
-			let url = `/data/aggregator/org/staff-select-list/${this.$store.state.user.agencyId}`;
-			const { data, code, msg } = await requestPost(url, {});
-
-			if (code === 0) {
-				this.optionStaff = data || [];
-			} else {
-				this.$message.error('请求工作人员数据失败！');
-			}
-		},
-
-		async handleEdit(row) {
-			// if (row.result == '0' && row.reviewTime == '') {
-			// 	this.$message.error('拟复查时间不能为空');
-			// } else {
-			// 	if (this.id) {
-			// 		console.log('有id');
-			// 		if (this.btnType == 'add') this.save(row);
-			// 		else this.edit(row);
-			// 	} else {
-			// 		this.$message.error('请先保存上方信息');
-			// 	}
-			// }
-			if (this.id) {
-				console.log('有id');
-				if (this.btnType == 'add') this.save(row);
-				else this.edit(row);
-			} else {
-				this.$message.error('请先保存上方信息');
-			}
-		},
-
-		handleAdd() {
-			this.btnType = 'add';
-			this.isEdit = true;
-
-			const item = {
-				isEdit: true,
-				enterpriseId: this.id,
-				patrolTime: '',
-				staffId: '',
-				staffName: '',
-				mobile: '',
-				result: '',
-				reviewTime: '',
-				imgList: []
-			};
-			this.computeImgShowList(item);
-			if (!this.disabled) {
				this.tableData.push(item);
			}
-		},
-
-		async save(row) {
-			
-			const params = {
-				...row,
-				enterpriseId: this.id,
-			};
-			console.log("params",params)
-			const url = `/actual/base/enterprise/addorupdate-patrol`;
-			const { data, code, msg } = await requestPost(url, params);
-			if (code === 0) {
-				this.$message.success('保存成功');
-				row.isEdit = false;
-				this.isEdit = false;
-				this.btnType = 'cancle';
-				this.getList();
-			} else {
-				this.$message.error(msg);
-			}
-		},
-
-		async edit(row) {
-			const params = {
-				...row
-			};
-			const url = `/actual/base/enterprise/addorupdate-patrol`;
-			const { data, code, msg } = await requestPost(url, params);
-			if (code === 0) {
-				this.$message.success('保存成功');
-				row.isEdit = false;
-				this.isEdit = false;
-				this.getList();
-			} else {
-				this.$message.error(msg);
-			}
-		},
-
-		async del(row) {
-			const url = `/actual/base/enterprise/del-patrol/${row.patrolId}`;
-			const { data, code, msg } = await requestPost(url);
-
-			if (code === 0) {
-				this.$message.success('删除成功');
-				this.getList();
-			} else {
-				this.$message.error(msg);
-			}
-		},
-
-		async getList() {
-			const url = `/actual/base/enterprise/patrollist/${this.id}`;
-			console.log('getList---------------------------------------------------------------------------', url);
-			const { data, code, msg } = await requestPost(url);
-			if (code === 0) {
-				console.log('data', data);
-				this.tableData = data.list.map(item => {
-					this.computeImgShowList(item);
-					return {
-						...item,
-						isEdit: false
-					};
-				});
-				this.handleAdd();
-			} else {
-				this.$message.error(msg);
-			}
-		}
-	}
-};
-</script>
-
-<style lang="scss" scoped>
-@import '@/assets/scss/buttonstyle.scss';
-@import '@/assets/scss/modules/management/list-main.scss';
-
-.mt10 {
-	margin-bottom: 10px;
-}
-.input-width {
-	width: 170px;
-}
+<template>
+	<div class="m-record">
+		<h3>检查记录</h3>
+		<div>
+			<!-- <div class="u-table-btn1 mt10" v-if="formType != 'view'">
+				<el-button size="small" class="diy-button--blue" :disabled="btnDisabled || disabled" @click="handleAdd">新增</el-button>
+			</div> -->
+			<div class="m-table-item">
+				<el-table :data="tableData" class="resi-table" row-key="id" border style="width: 100%">
+					<el-table-column label="序号" type="index" align="center" width="50"></el-table-column>
+					<el-table-column prop="patrolTime" label="检查时间" align="center" width="200px">
+						<template slot-scope="scope">
+							<el-date-picker
+								v-if="scope.row.isEdit"
+								v-model.trim="scope.row.patrolTime"
+								type="date"
+								class="input-width"
+								value-format="yyyy-MM-dd"
+								placeholder="选择日期"
+							></el-date-picker>
+							<div v-else class="div-content">{{ scope.row.patrolTime }}</div>
+						</template>
+					</el-table-column>
+					<el-table-column prop="staffId" label="检查人员" align="center" width="200px">
+						<template slot-scope="scope">
+							<el-select
+								v-if="scope.row.isEdit"
+								v-model.trim="scope.row.staffId"
+								placeholder="请选择"
+								class="input-width"
+								@change="handleChangeStaff(scope.row)"
+								clearable
+							>
+								<el-option v-for="subItem in optionStaff" :key="subItem.value" :label="subItem.label" :value="subItem.value"></el-option>
+							</el-select>
+							<div v-else class="div-content">{{ scope.row.staffName }}</div>
+						</template>
+					</el-table-column>
+
+					<el-table-column prop="mobile" label="联系电话" align="center" width="200px">
+						<template slot-scope="scope">
+							<el-input v-if="scope.row.isEdit" type="number" v-model.trim="scope.row.mobile" placeholder="请输入" class="input-width" clearable disabled></el-input>
+							<div v-else class="div-content">{{ scope.row.mobile }}</div>
+						</template>
+					</el-table-column>
+
+					<el-table-column prop="result" label="检查结果" align="center" width="200px">
+						<template slot-scope="scope">
+							<el-select v-if="scope.row.isEdit" v-model.trim="scope.row.result" placeholder="请选择" class="input-width" size="small" clearable>
+								<el-option v-for="subItem in optionResult" :key="subItem.value" :label="subItem.label" :value="subItem.value"></el-option>
+							</el-select>
+							<div v-else class="div-content">{{ scope.row.result == 1 ? '正常' : '异常' }}</div>
+						</template>
+					</el-table-column>
+					<el-table-column prop="detailed" label="隐患明细" align="center" width="200px">
+						<template slot-scope="scope">
+							<el-input
+								v-if="scope.row.isEdit"
+								type="text"
+								v-model.trim="scope.row.detailed"
+								placeholder="请输入"
+								class="input-width"
+								maxlength="500"
+								clearable
+							></el-input>
+							<div v-else class="div-content">{{ scope.row.detailed }}</div>
+						</template>
+					</el-table-column>
+					<el-table-column prop="imgList" label="图片列表" align="center">
+						<template slot-scope="scope">
+							<div v-if="scope.row.isEdit">
+								<el-upload
+								:disabled="scope.row.imgList.length == 3"
+									:headers="$getElUploadHeaders()"
+									class="avatar-uploader"
+									:action="uploadUrl"
+									:data="{ customerId: customerId }"
+									:show-file-list="true"
+									:limit="3"
+									:file-list="scope.row.imgList"
+									:on-success="res => handleImgSuccess(res, scope.row)"
+									:on-remove="res => handleImgRemove(res, scope.row)"
+									list-type="picture"
+									:before-upload="beforeImgUpload"
+								>
+									<div v-if="scope.row.imgList.length != 3"><i class="el-icon-plus avatar-uploader-icon"></i>
+									最多三张图片</div>
+								</el-upload>
+							</div>
+
+							<div v-else class="div-content">
+								<el-image
+									v-if="scope.row.imgList.length > 0"
+									style="width: 100px; height: 50px"
+									:src="scope.row.imgList[0]"
+									fit="cover"
+									:preview-src-list="scope.row.imgList"
+								></el-image>
+							</div>
+						</template>
+					</el-table-column>
+					<el-table-column prop="reviewTime" label="拟复查时间" align="center" width="200px">
+						<template slot-scope="scope">
+							<el-date-picker
+								v-if="scope.row.isEdit"
+								v-model.trim="scope.row.reviewTime"
+								type="date"
+								class="input-width"
+								value-format="yyyy-MM-dd"
+								placeholder="选择日期"
+							></el-date-picker>
+							<div v-else class="div-content">{{ scope.row.reviewTime }}</div>
+						</template>
+					</el-table-column>
+					<el-table-column v-if="!disabled" fixed="right" label="操作" align="center" width="120">
+						<template slot-scope="scope">
+							<template v-if="scope.row.isEdit">
+								<el-button @click="handleEdit(scope.row)" type="text" size="small" class="btn-color-edit">保存</el-button>
+								<el-button @click="handleChange(scope.row, 'cancle')" type="text" size="small" class="btn-color-edit">取消</el-button>
+							</template>
+							<template v-else>
+								<!-- v-if="formType == 'edit'" -->
+								<el-button  @click="handleChange(scope.row, 'edit')" type="text" size="small" :disabled="disabled" class="btn-color-edit">
+									修改
+								</el-button>
+								<el-popconfirm  title="删除之后无法恢复，确认删除？" @onConfirm="del(scope.row)" @confirm="del(scope.row)">
+									<el-button slot="reference" type="text" size="small" class="btn-color-del" style="margin-left: 10px">删除</el-button>
+								</el-popconfirm>
+							</template>
+						</template>
+					</el-table-column>
+				</el-table>
+			</div>
+		</div>
+	</div>
+</template>
+
+<script>
+import { requestPost, requestGet } from '@/js/dai/request';
+export default {
+	props: {
+		id: {
+			type: String,
+			default: ''
+		},
+		info: {
+			type: Object,
+			default: () => ({})
+		},
+		disabled: {
+			type: Boolean,
+			default: false
+		},
+		formType: {
+			type: String,
+			default: ''
+		},
+		source: {
+			//展示来源：manage  管理平台    visiual  可视化平台
+			type: String,
+			default: 'manage'
+		}
+	},
+	data() {
+		return {
+			uploadUrl: window.SITE_CONFIG['apiURL'] + '/oss/file/uploadqrcodeV2',
+			customerId: localStorage.getItem('customerId'),
+
+			btnDisabled: false,
+			btnType: 'cancle',
+			isEdit: false,
+			tableData: [],
+			tempRow: {},
+
+			optionResult: [
+				{
+					label: '异常',
+					value: '0'
+				},
+				{
+					label: '正常',
+					value: '1'
+				}
+			],
+			optionStaff: [
+				// {
+				//   label: "人名",
+				//   value: "inspectStaffId",
+				// },
+			]
+		};
+	},
+
+	computed: {
+		allowOperate() {
+			const {
+				info: { agencyId }
+			} = this;
+			return agencyId && agencyId == this.$store.state.user.agencyId;
+		}
+	},
+
+	watch: {
+		id: {
+			handler(val) {
+				console.log("ddddddddddddd",val)
+				if (val.length > 0) {
+					this.btnDisabled = false;
+					// this.getList();
+				} else this.btnDisabled = true;
+			},
+			immediate: true
+		}
+	},
+
+	created() {
+		this.getOptionStaff();
+		if (this.id) {
+			this.getList();
+		} else {
+			this.handleAdd();
+		}
+	},
+
+	methods: {
+		beforeImgUpload(file) {
+			console.log(file);
+			const isLt1M = file.size / 1024 / 1024 < 10;
+			const srcType = file.type;
+			const format = file.name.split('.').pop();
+
+			if (!isLt1M) {
+				this.$message.error('上传文件大小不能超过 10MB!');
+				return false;
+			}
+			if (srcType.indexOf('image') == -1) {
+				this.$message.error('仅限图片格式');
+				return false;
+			}
+			return true;
+		},
+
+		handleImgSuccess(res, row) {
+			if (res.code === 0 && res.msg === 'success') {
+				row.imgList.push(res.data.url);
+				this.computeImgShowList(row);
+			} else {
+				this.$message.error(res.msg);
+			}
+		},
+
+		computeImgShowList(row) {
+			row.imgShowList = row.imgList.map(url => {
+				return { name: '', url };
+			});
+		},
+
+		handleImgRemove(file, row) {
+			let url = file.url || file.response.data.url;
+			if (url) {
+				row.imgList = row.imgList.filter(item => item !== url);
+				this.computeImgShowList(row);
+			}
+		},
+
+		getRowClass({ rowIndex, columnIndex }) {
+			if (rowIndex === 0) {
+				return 'background: #2195fe; color: #fff;';
+			}
+		},
+
+		handleChange(row, type) {
+			if (type == 'cancle') {
+				row = { ...this.tempRow };
+				row.isEdit = false;
+				if (this.btnType == 'add') this.tableData.pop();
+				this.getList();
+			} else {
+				this.tempRow = { ...row };
+				row.isEdit = true;
+			}
+			this.btnType = type;
+			this.isEdit = !this.isEdit;
+		},
+
+		handleChangeStaff(row) {
+			const { staffId } = row;
+			const { optionStaff } = this;
+			let item = optionStaff.find(item => item.value == staffId);
+			if (item) {
+				row.staffName = item.name;
+				row.mobile = item.mobile;
+			}
+		},
+
+		async getOptionStaff() {
+			let url = `/data/aggregator/org/staff-select-list/${this.$store.state.user.agencyId}`;
+			const { data, code, msg } = await requestPost(url, {});
+
+			if (code === 0) {
+				this.optionStaff = data || [];
+			} else {
+				this.$message.error('请求工作人员数据失败！');
+			}
+		},
+
+		async handleEdit(row) {
+			// if (row.result == '0' && row.reviewTime == '') {
+			// 	this.$message.error('拟复查时间不能为空');
+			// } else {
+			// 	if (this.id) {
+			// 		console.log('有id');
+			// 		if (this.btnType == 'add') this.save(row);
+			// 		else this.edit(row);
+			// 	} else {
+			// 		this.$message.error('请先保存上方信息');
+			// 	}
+			// }
+			if (this.id) {
+				console.log('有id');
+				if (this.btnType == 'add') this.save(row);
+				else this.edit(row);
+			} else {
+				this.$message.error('请先保存上方信息');
+			}
+		},
+
+		handleAdd() {
+			this.btnType = 'add';
+			this.isEdit = true;
+
+			const item = {
+				isEdit: true,
+				enterpriseId: this.id,
+				patrolTime: '',
+				staffId: '',
+				staffName: '',
+				mobile: '',
+				result: '',
+				reviewTime: '',
+				imgList: []
+			};
+			this.computeImgShowList(item);
+			if (!this.disabled) {
+				this.tableData.push(item);
+			}
+		},
+
+		async save(row) {
+			
+			const params = {
+				...row,
+				enterpriseId: this.id,
+			};
+			console.log("params",params)
+			const url = `/actual/base/enterprise/addorupdate-patrol`;
+			const { data, code, msg } = await requestPost(url, params);
+			if (code === 0) {
+				this.$message.success('保存成功');
+				row.isEdit = false;
+				this.isEdit = false;
+				this.btnType = 'cancle';
+				this.getList();
+			} else {
+				this.$message.error(msg);
+			}
+		},
+
+		async edit(row) {
+			const params = {
+				...row
+			};
+			const url = `/actual/base/enterprise/addorupdate-patrol`;
+			const { data, code, msg } = await requestPost(url, params);
+			if (code === 0) {
+				this.$message.success('保存成功');
+				row.isEdit = false;
+				this.isEdit = false;
+				this.getList();
+			} else {
+				this.$message.error(msg);
+			}
+		},
+
+		async del(row) {
+			const url = `/actual/base/enterprise/del-patrol/${row.patrolId}`;
+			const { data, code, msg } = await requestPost(url);
+
+			if (code === 0) {
+				this.$message.success('删除成功');
+				this.getList();
+			} else {
+				this.$message.error(msg);
+			}
+		},
+
+		async getList() {
+			const url = `/actual/base/enterprise/patrollist/${this.id}`;
+			console.log('getList---------------------------------------------------------------------------', url);
+			const { data, code, msg } = await requestPost(url);
+			if (code === 0) {
+				console.log('data', data);
+				this.tableData = data.list.map(item => {
+					this.computeImgShowList(item);
+					return {
+						...item,
+						isEdit: false
+					};
+				});
+				this.handleAdd();
+			} else {
+				this.$message.error(msg);
+			}
+		}
+	}
+};
+</script>
+
+<style lang="scss" scoped>
+@import '@/assets/scss/buttonstyle.scss';
+@import '@/assets/scss/modules/management/list-main.scss';
+
+.mt10 {
+	margin-bottom: 10px;
+}
+.input-width {
+	width: 170px;
+}
 </style>
diff --git a/src/views/modules/shequzhili/tuceng/anquan/shebei/addForm.vue b/src/views/modules/shequzhili/tuceng/anquan/shebei/addForm.vue
index 726accb26..a086e43c4 100644
--- a/src/views/modules/shequzhili/tuceng/anquan/shebei/addForm.vue
+++ b/src/views/modules/shequzhili/tuceng/anquan/shebei/addForm.vue
@@ -11,30 +11,30 @@
 					<el-row>
 						<el-col :span="6">
 							<el-form-item label="设备名称" prop="equipmentName">
-								<el-input v-model="formData.equipmentName" :disabled="disabled" class="u-item-width-normal" size="small" clearable placeholder="请输入"></el-input>
+								<el-input v-model.trim="formData.equipmentName" :disabled="disabled" class="u-item-width-normal" size="small" clearable placeholder="请输入"></el-input>
 							</el-form-item>
 						</el-col>
 						<el-col :span="6">
 							<el-form-item label="设备类型" prop="equipmentCategoryCode">
-								<el-select v-model="formData.equipmentCategoryCode" :disabled="disabled" placeholder="请选择" size="small" clearable class="u-item-width-normal">
+								<el-select v-model.trim="formData.equipmentCategoryCode" :disabled="disabled" placeholder="请选择" size="small" clearable class="u-item-width-normal">
 									<el-option v-for="item in equipmentCategoryCodeArray" :key="item.value" :label="item.label" :value="item.value"></el-option>
 								</el-select>
 							</el-form-item>
 						</el-col>
 						<el-col :span="6">
 							<el-form-item label="负责人" prop="principalName">
-								<el-input v-model="formData.principalName" :disabled="disabled" class="u-item-width-normal" size="small" clearable placeholder="请输入"></el-input>
+								<el-input v-model.trim="formData.principalName" :disabled="disabled" class="u-item-width-normal" size="small" clearable placeholder="请输入"></el-input>
 							</el-form-item>
 						</el-col>
 						<el-col :span="6">
 							<el-form-item label="联系电话" prop="contactNum">
-								<el-input v-model="formData.contactNum" :disabled="disabled" class="u-item-width-normal" size="small" clearable placeholder="请输入"></el-input>
+								<el-input v-model.trim="formData.contactNum" :disabled="disabled" class="u-item-width-normal" size="small" clearable placeholder="请输入"></el-input>
 							</el-form-item>
 						</el-col>
 						<el-col :span="6">
 							<el-form-item label="所处位置" prop="location" style="display: block">
 								<el-select
-									v-model="formData.location"
+									v-model.trim="formData.location"
 									:disabled="disabled"
 									filterable
 									remote
diff --git a/src/views/modules/shequzhili/tuceng/anquan/shebei/index.vue b/src/views/modules/shequzhili/tuceng/anquan/shebei/index.vue
index cb28c1a83..27895053d 100644
--- a/src/views/modules/shequzhili/tuceng/anquan/shebei/index.vue
+++ b/src/views/modules/shequzhili/tuceng/anquan/shebei/index.vue
@@ -5,18 +5,18 @@
 				<el-form :inline="true" :model="formData" ref="ref_searchform" :label-width="'100px'">
 					<div>
 						<el-form-item label="设备名称" prop="equipmentName">
-							<el-input v-model="formData.equipmentName" class="u-item-width-normal" size="small" clearable placeholder="请输入"></el-input>
+							<el-input v-model.trim="formData.equipmentName" class="u-item-width-normal" size="small" clearable placeholder="请输入"></el-input>
 						</el-form-item>
 						<el-form-item label="设备类型" prop="equipmentCategoryCode">
-							<el-select v-model="formData.equipmentCategoryCode" placeholder="请选择" size="small" clearable class="u-item-width-normal">
+							<el-select v-model.trim="formData.equipmentCategoryCode" placeholder="请选择" size="small" clearable class="u-item-width-normal">
 								<el-option v-for="item in equipmentCategoryCodeArray" :key="item.value" :label="item.label" :value="item.value"></el-option>
 							</el-select>
 						</el-form-item>
 						<el-form-item label="所处位置" prop="location">
-							<el-input v-model="formData.location" class="u-item-width-normal" size="small" clearable placeholder="请输入"></el-input>
+							<el-input v-model.trim="formData.location" class="u-item-width-normal" size="small" clearable placeholder="请输入"></el-input>
 						</el-form-item>
 						<el-form-item label="负责人" prop="principalName">
-							<el-input v-model="formData.principalName" class="u-item-width-normal" size="small" clearable placeholder="请输入"></el-input>
+							<el-input v-model.trim="formData.principalName" class="u-item-width-normal" size="small" clearable placeholder="请输入"></el-input>
 						</el-form-item>
 						<el-row>
 							<el-col :span="24" align="right">
diff --git a/src/views/modules/shequzhili/tuceng/anquan/shebei/record.vue b/src/views/modules/shequzhili/tuceng/anquan/shebei/record.vue
index d5e49cddd..4fd0c2da0 100644
--- a/src/views/modules/shequzhili/tuceng/anquan/shebei/record.vue
+++ b/src/views/modules/shequzhili/tuceng/anquan/shebei/record.vue
@@ -10,14 +10,14 @@
 					<el-table-column label="序号" type="index" align="center" width="50"></el-table-column>
 					<el-table-column prop="inspectTime" label="检查时间" align="center" width="200px">
 						<template slot-scope="scope">
-							<el-date-picker v-if="scope.row.isEdit" v-model="scope.row.inspectTime" type="date"
+							<el-date-picker v-if="scope.row.isEdit" v-model.trim="scope.row.inspectTime" type="date"
 								class="input-width" value-format="yyyy-MM-dd" placeholder="选择日期"></el-date-picker>
 							<div v-else class="div-content">{{ scope.row.inspectTime }}</div>
 						</template>
 					</el-table-column>
 					<el-table-column prop="inspectStaffId" label="检查人员" align="center" width="200px">
 						<template slot-scope="scope">
-							<el-select v-if="scope.row.isEdit" v-model="scope.row.inspectStaffId" placeholder="请选择"
+							<el-select v-if="scope.row.isEdit" v-model.trim="scope.row.inspectStaffId" placeholder="请选择"
 								class="input-width" @change="handleChangeStaff(scope.row)" clearable>
 								<el-option v-for="subItem in optionStaff" :key="subItem.value" :label="subItem.label"
 									:value="subItem.value"></el-option>
@@ -27,14 +27,14 @@
 					</el-table-column>
 					<el-table-column prop="inspectStaffMobile" label="联系电话" align="center" width="200px">
 						<template slot-scope="scope">
-							<el-input v-if="scope.row.isEdit" type="number" v-model="scope.row.inspectStaffMobile"
+							<el-input v-if="scope.row.isEdit" type="number" v-model.trim="scope.row.inspectStaffMobile"
 								placeholder="请输入" class="input-width" clearable disabled></el-input>
 							<div v-else class="div-content">{{ scope.row.inspectStaffMobile }}</div>
 						</template>
 					</el-table-column>
 					<el-table-column prop="inspectResult" label="检查结果" align="center">
 						<template slot-scope="scope">
-							<el-select v-if="scope.row.isEdit" v-model="scope.row.inspectResult" placeholder="请选择"
+							<el-select v-if="scope.row.isEdit" v-model.trim="scope.row.inspectResult" placeholder="请选择"
 								class="input-width" size="small" clearable>
 								<el-option v-for="subItem in optionResult" :key="subItem.value" :label="subItem.label"
 									:value="subItem.value"></el-option>
@@ -52,7 +52,7 @@
 							<el-input
 								v-if="scope.row.isEdit"
 								type="text"
-								v-model="scope.row.detailed"
+								v-model.trim="scope.row.detailed"
 								placeholder="请输入"
 								class="input-width"
 								maxlength="500"
@@ -85,7 +85,7 @@
 					</el-table-column>
 					<el-table-column prop="nextInspectTime" label="拟复查时间" align="center" width="200px">
 						<template slot-scope="scope">
-							<el-date-picker v-if="scope.row.isEdit" v-model="scope.row.nextInspectTime" type="date"
+							<el-date-picker v-if="scope.row.isEdit" v-model.trim="scope.row.nextInspectTime" type="date"
 								class="input-width" value-format="yyyy-MM-dd" placeholder="选择日期"></el-date-picker>
 							<div v-else class="div-content">{{ scope.row.nextInspectTime }}</div>
 						</template>
diff --git a/src/views/modules/shequzhili/tuceng/anquan/xuncha/cpts/record.vue b/src/views/modules/shequzhili/tuceng/anquan/xuncha/cpts/record.vue
index 89ed35e7b..acd859196 100644
--- a/src/views/modules/shequzhili/tuceng/anquan/xuncha/cpts/record.vue
+++ b/src/views/modules/shequzhili/tuceng/anquan/xuncha/cpts/record.vue
@@ -26,7 +26,7 @@
                        width="200px">
         <template slot-scope="scope">
           <el-date-picker v-if="scope.row.isEdit"
-                          v-model="scope.row.patrolTime"
+                          v-model.trim="scope.row.patrolTime"
                           type="date"
                           class="input-width"
                           value-format="yyyy-MM-dd"
@@ -43,7 +43,7 @@
                        width="200px">
         <template slot-scope="scope">
           <el-select v-if="scope.row.isEdit"
-                     v-model="scope.row.staffId"
+                     v-model.trim="scope.row.staffId"
                      placeholder="请选择"
                      class="input-width"
                      @change="handleChangeStaff(scope.row)"
@@ -66,7 +66,7 @@
         <template slot-scope="scope">
           <el-input v-if="scope.row.isEdit"
                     type="number"
-                    v-model="scope.row.mobile"
+                    v-model.trim="scope.row.mobile"
                     placeholder="请输入"
                     class="input-width"
                     clearable
@@ -82,7 +82,7 @@
                        width="200px">
         <template slot-scope="scope">
           <el-select v-if="scope.row.isEdit"
-                     v-model="scope.row.result"
+                     v-model.trim="scope.row.result"
                      placeholder="请选择"
                      class="input-width"
                      size="small"
@@ -105,7 +105,7 @@
         <template slot-scope="scope">
           <el-input v-if="scope.row.isEdit"
                     type="text"
-                    v-model="scope.row.detailed"
+                    v-model.trim="scope.row.detailed"
                     placeholder="请输入"
                     class="input-width"
                     maxlength="500"
@@ -152,7 +152,7 @@
                        width="200px">
         <template slot-scope="scope">
           <el-date-picker v-if="scope.row.isEdit"
-                          v-model="scope.row.reviewTime"
+                          v-model.trim="scope.row.reviewTime"
                           type="date"
                           class="input-width"
                           value-format="yyyy-MM-dd"
diff --git a/src/views/modules/shequzhili/tuceng/anquan/yinhuan/addForm.vue b/src/views/modules/shequzhili/tuceng/anquan/yinhuan/addForm.vue
index 4b325f6ae..17bf93dac 100644
--- a/src/views/modules/shequzhili/tuceng/anquan/yinhuan/addForm.vue
+++ b/src/views/modules/shequzhili/tuceng/anquan/yinhuan/addForm.vue
@@ -13,20 +13,20 @@
 						<el-col :span="8">
 							<el-form-item label="上报时间" prop="reportTime">
 								<template slot-scope="scope">
-									<el-date-picker v-model="formData.reportTime" type="date" class="input-width"
+									<el-date-picker v-model.trim="formData.reportTime" type="date" class="input-width"
 										value-format="yyyy-MM-dd" placeholder="选择日期"></el-date-picker>
 								</template>
 							</el-form-item>
 						</el-col>
 						<el-col :span="8">
 							<el-form-item label="隐患场所" prop="dangerPlaceName">
-								<el-input v-model="formData.dangerPlaceName" class="u-item-width-normal" size="small"
+								<el-input v-model.trim="formData.dangerPlaceName" class="u-item-width-normal" size="small"
 									clearable placeholder="请输入"></el-input>
 							</el-form-item>
 						</el-col>
 						<el-col :span="8">
 							<el-form-item label="所属网格" prop="gridId">
-								<el-select class="u-item-width-normal" v-model="formData.gridId" placeholder="全部"
+								<el-select class="u-item-width-normal" v-model.trim="formData.gridId" placeholder="全部"
 									size="small" clearable>
 									<el-option v-for="item in gridList" :key="item.value" :label="item.label"
 										:value="item.value"></el-option>
@@ -35,7 +35,7 @@
 						</el-col>
 						<el-col :span="24">
 							<el-form-item label="隐患内容" prop="dangerContent">
-								<el-input type="textarea" :rows="2" style="width:500px" v-model="formData.dangerContent"
+								<el-input type="textarea" :rows="2" style="width:500px" v-model.trim="formData.dangerContent"
 									:disabled="disabled" class="u-item-width-normal" size="small" clearable
 									placeholder="请输入"></el-input>
 								<div v-if="pageType != 'view'" style="margin-top:10px">
@@ -62,24 +62,24 @@
 						</el-col>
 						<el-col :span="8">
 							<!-- <el-form-item label="处理情况" prop="handleState">
-							<el-select v-model="formData.handleState" placeholder="请选择" size="small" clearable class="u-item-width-normal">
+							<el-select v-model.trim="formData.handleState" placeholder="请选择" size="small" clearable class="u-item-width-normal">
 								<el-option v-for="item in handleStateArray" :key="item.value" :label="item.label" :value="item.value"></el-option>
 							</el-select>
 						</el-form-item> -->
 							<el-form-item label="上报人" prop="reportPerson">
-								<el-input v-model="formData.reportPerson" class="u-item-width-normal" size="small"
+								<el-input v-model.trim="formData.reportPerson" class="u-item-width-normal" size="small"
 									clearable placeholder="请输入"></el-input>
 							</el-form-item>
 						</el-col>
 						<el-col :span="8">
 							<el-form-item label="联系电话" prop="mobile">
-								<el-input v-model="formData.mobile" class="u-item-width-normal" size="small" clearable
+								<el-input v-model.trim="formData.mobile" class="u-item-width-normal" size="small" clearable
 									placeholder="请输入"></el-input>
 							</el-form-item>
 						</el-col>
 						<el-col :span="8">
 							<el-form-item label="隐患位置" prop="location" style="display: block">
-								<el-select v-model="formData.location" :disabled="disabled" filterable remote
+								<el-select v-model.trim="formData.location" :disabled="disabled" filterable remote
 									:reserve-keyword="true" placeholder="请输入关键词" :remote-method="remoteMethod"
 									:loading="loading" @keyup.enter.native="remoteMethod(formData.location)">
 									<el-option v-for="(item, index) in searchOptions"
diff --git a/src/views/modules/shequzhili/tuceng/anquan/yinhuan/index.vue b/src/views/modules/shequzhili/tuceng/anquan/yinhuan/index.vue
index 6a2ce948a..42884efee 100644
--- a/src/views/modules/shequzhili/tuceng/anquan/yinhuan/index.vue
+++ b/src/views/modules/shequzhili/tuceng/anquan/yinhuan/index.vue
@@ -5,30 +5,30 @@
 				<el-form :inline="true" :model="formData" ref="ref_searchform" :label-width="'100px'">
 					<div>
 						<el-form-item label="所属网格" prop="gridId">
-							<el-select class="u-item-width-normal" v-model="formData.gridId" placeholder="全部" size="small" clearable>
+							<el-select class="u-item-width-normal" v-model.trim="formData.gridId" placeholder="全部" size="small" clearable>
 								<el-option v-for="item in gridList" :key="item.value" :label="item.label" :value="item.value"></el-option>
 							</el-select>
 						</el-form-item>
 
 						<el-form-item label="隐患场所" prop="dangerPlaceName">
-							<el-input v-model="formData.dangerPlaceName" class="u-item-width-normal" size="small" clearable placeholder="请输入"></el-input>
+							<el-input v-model.trim="formData.dangerPlaceName" class="u-item-width-normal" size="small" clearable placeholder="请输入"></el-input>
 						</el-form-item>
 						<el-form-item label="处理情况" prop="handleState">
-							<el-select v-model="formData.handleState" placeholder="请选择" size="small" clearable class="u-item-width-normal">
+							<el-select v-model.trim="formData.handleState" placeholder="请选择" size="small" clearable class="u-item-width-normal">
 								<el-option v-for="item in handleStateArray" :key="item.value" :label="item.label" :value="item.value"></el-option>
 							</el-select>
 						</el-form-item>
 						<el-form-item label="隐患内容" prop="dangerContent">
-							<el-input v-model="formData.dangerContent" class="u-item-width-normal" size="small" clearable placeholder="请输入"></el-input>
+							<el-input v-model.trim="formData.dangerContent" class="u-item-width-normal" size="small" clearable placeholder="请输入"></el-input>
 						</el-form-item>
 						<el-form-item label="上报人" prop="reportPerson">
-							<el-input v-model="formData.reportPerson" class="u-item-width-normal" size="small" clearable placeholder="请输入"></el-input>
+							<el-input v-model.trim="formData.reportPerson" class="u-item-width-normal" size="small" clearable placeholder="请输入"></el-input>
 						</el-form-item>
 						<el-form-item label="隐患位置" prop="location">
-							<el-input v-model="formData.location" class="u-item-width-normal" size="small" clearable placeholder="请输入"></el-input>
+							<el-input v-model.trim="formData.location" class="u-item-width-normal" size="small" clearable placeholder="请输入"></el-input>
 						</el-form-item>
 						<el-form-item label="上报时间" prop="reportTime">
-							<el-date-picker v-model="formData.reportTime" type="date" class="input-width" value-format="yyyy-MM-dd" placeholder="选择日期"></el-date-picker>
+							<el-date-picker v-model.trim="formData.reportTime" type="date" class="input-width" value-format="yyyy-MM-dd" placeholder="选择日期"></el-date-picker>
 						</el-form-item>
 						<el-row>
 							<el-col :span="24" align="right">
diff --git a/src/views/modules/shequzhili/tuceng/anquan/yinhuan/record.vue b/src/views/modules/shequzhili/tuceng/anquan/yinhuan/record.vue
index f08e825e8..c9361e936 100644
--- a/src/views/modules/shequzhili/tuceng/anquan/yinhuan/record.vue
+++ b/src/views/modules/shequzhili/tuceng/anquan/yinhuan/record.vue
@@ -13,7 +13,7 @@
 						<template slot-scope="scope">
 							<el-date-picker
 								v-if="scope.row.isEdit"
-								v-model="scope.row.handleTime"
+								v-model.trim="scope.row.handleTime"
 								type="date"
 								class="input-width"
 								value-format="yyyy-MM-dd"
@@ -24,7 +24,7 @@
 					</el-table-column>
 					<el-table-column prop="handleState" label="处理情况" align="center">
 						<template slot-scope="scope">
-							<el-select v-if="scope.row.isEdit" v-model="scope.row.handleState" placeholder="请选择" class="input-width" size="small" clearable>
+							<el-select v-if="scope.row.isEdit" v-model.trim="scope.row.handleState" placeholder="请选择" class="input-width" size="small" clearable>
 								<el-option v-for="subItem in optionResult" :key="subItem.value" :label="subItem.label" :value="subItem.value"></el-option>
 							</el-select>
 							<div v-else class="div-content">{{ scope.row.handleState == 1 ? '已处理' : '待处理' }}</div>
@@ -36,7 +36,7 @@
 								type="textarea"
 								:rows="2"
 								v-if="scope.row.isEdit"
-								v-model="scope.row.remark"
+								v-model.trim="scope.row.remark"
 								:disabled="disabled"
 								class="u-item-width-normal"
 								size="small"
diff --git a/src/views/modules/shequzhili/tuceng/chengshiguanli/addForm.vue b/src/views/modules/shequzhili/tuceng/chengshiguanli/addForm.vue
index 79c88d33b..0ebfec47f 100644
--- a/src/views/modules/shequzhili/tuceng/chengshiguanli/addForm.vue
+++ b/src/views/modules/shequzhili/tuceng/chengshiguanli/addForm.vue
@@ -11,19 +11,19 @@
 					<el-row>
 						<el-col :span="6">
 							<el-form-item label="场所名称" prop="name">
-								<el-input v-model="formData.name" :disabled="disabled" class="u-item-width-normal" size="small" clearable placeholder="请输入"></el-input>
+								<el-input v-model.trim="formData.name" :disabled="disabled" class="u-item-width-normal" size="small" clearable placeholder="请输入"></el-input>
 							</el-form-item>
 						</el-col>
 						<el-col :span="6">
 							<el-form-item label="所属组织" prop="gridId">
-								<el-select v-model="formData.gridId" class="u-item-width-normal" :disabled="disabled" placeholder="全部" size="small" clearable>
+								<el-select v-model.trim="formData.gridId" class="u-item-width-normal" :disabled="disabled" placeholder="全部" size="small" clearable>
 									<el-option v-for="item in gridList" :key="item.value" :label="item.label" :value="item.value"></el-option>
 								</el-select>
 							</el-form-item>
 						</el-col>
 						<el-col :span="6">
 							<el-form-item label="场所类型" prop="category">
-								<el-select class="u-item-width-normal" :disabled="disabled" v-model="formData.category" placeholder="全部" size="small" clearable>
+								<el-select class="u-item-width-normal" :disabled="disabled" v-model.trim="formData.category" placeholder="全部" size="small" clearable>
 									<el-option v-for="item in placeTypeList" :key="item.value" :label="item.label" :value="item.value"></el-option>
 								</el-select>
 							</el-form-item>
@@ -31,7 +31,7 @@
 						<el-col :span="6">
 							<el-form-item label="场所地址" prop="address" style="display: block">
 								<el-select
-									v-model="formData.address"
+									v-model.trim="formData.address"
 								
 									:disabled="disabled"
 									filterable
diff --git a/src/views/modules/shequzhili/tuceng/chengshiguanli/index.vue b/src/views/modules/shequzhili/tuceng/chengshiguanli/index.vue
index 2e598e121..d2dec3db2 100644
--- a/src/views/modules/shequzhili/tuceng/chengshiguanli/index.vue
+++ b/src/views/modules/shequzhili/tuceng/chengshiguanli/index.vue
@@ -5,22 +5,22 @@
 				<el-form :inline="true" :model="formData" ref="ref_searchform" :label-width="'100px'">
 					<div>
 						<el-form-item label="所属组织" prop="gridId">
-							<el-select class="u-item-width-normal" v-model="formData.gridId" placeholder="全部" size="small" clearable>
+							<el-select class="u-item-width-normal" v-model.trim="formData.gridId" placeholder="全部" size="small" clearable>
 								<el-option v-for="item in gridList" :key="item.value" :label="item.label" :value="item.value"></el-option>
 							</el-select>
 						</el-form-item>
 						<el-form-item label="场所名称" prop="name">
-							<el-input v-model="formData.name" class="u-item-width-normal" size="small" clearable placeholder="请输入"></el-input>
+							<el-input v-model.trim="formData.name" class="u-item-width-normal" size="small" clearable placeholder="请输入"></el-input>
 						</el-form-item>
 
 						<el-form-item label="场所类型" prop="category">
-							<el-select class="u-item-width-normal" v-model="formData.category" placeholder="全部" size="small" clearable>
+							<el-select class="u-item-width-normal" v-model.trim="formData.category" placeholder="全部" size="small" clearable>
 								<el-option v-for="item in categoryNameList" :key="item.value" :label="item.label" :value="item.value"></el-option>
 							</el-select>
 						</el-form-item>
 
 						<el-form-item label="场所地址" prop="address">
-							<el-input v-model="formData.address" class="u-item-width-normal" size="small" clearable placeholder="请输入"></el-input>
+							<el-input v-model.trim="formData.address" class="u-item-width-normal" size="small" clearable placeholder="请输入"></el-input>
 						</el-form-item>
 
 						<el-row>
diff --git a/src/views/modules/shequzhili/tuceng/gonggongfuwu/addForm.vue b/src/views/modules/shequzhili/tuceng/gonggongfuwu/addForm.vue
index d356d83be..2f1f7cf96 100644
--- a/src/views/modules/shequzhili/tuceng/gonggongfuwu/addForm.vue
+++ b/src/views/modules/shequzhili/tuceng/gonggongfuwu/addForm.vue
@@ -11,36 +11,36 @@
 					<el-row>
 						<el-col :span="6">
 							<el-form-item label="设备名称" prop="equipmentName">
-								<el-input v-model="formData.equipmentName" :disabled="disabled" class="u-item-width-normal" size="small" clearable placeholder="请输入"></el-input>
+								<el-input v-model.trim="formData.equipmentName" :disabled="disabled" class="u-item-width-normal" size="small" clearable placeholder="请输入"></el-input>
 							</el-form-item>
 						</el-col>
 						<el-col :span="6">
 							<el-form-item label="设备编号" prop="equipmentNum">
-								<el-input v-model="formData.equipmentNum" :disabled="disabled" class="u-item-width-normal" size="small" clearable placeholder="请输入"></el-input>
+								<el-input v-model.trim="formData.equipmentNum" :disabled="disabled" class="u-item-width-normal" size="small" clearable placeholder="请输入"></el-input>
 							</el-form-item>
 						</el-col>
 						<el-col :span="6">
 							<el-form-item label="设备类型" prop="equipmentCategoryCode">
-								<el-select v-model="formData.equipmentCategoryCode" :disabled="disabled" placeholder="请选择" size="small" clearable class="u-item-width-normal">
+								<el-select v-model.trim="formData.equipmentCategoryCode" :disabled="disabled" placeholder="请选择" size="small" clearable class="u-item-width-normal">
 									<el-option v-for="item in equipmentCategoryCodeArray" :key="item.value" :label="item.label" :value="item.value"></el-option>
 								</el-select>
 							</el-form-item>
 						</el-col>
 						<el-col :span="6">
 							<el-form-item label="负责人" prop="principalName">
-								<el-input v-model="formData.principalName" :disabled="disabled" class="u-item-width-normal" size="small" clearable placeholder="请输入"></el-input>
+								<el-input v-model.trim="formData.principalName" :disabled="disabled" class="u-item-width-normal" size="small" clearable placeholder="请输入"></el-input>
 							</el-form-item>
 						</el-col>
 						<el-col :span="6">
 							<el-form-item label="联系电话" prop="contactNum">
-								<el-input v-model="formData.contactNum" :disabled="disabled" class="u-item-width-normal" size="small" clearable placeholder="请输入"></el-input>
+								<el-input v-model.trim="formData.contactNum" :disabled="disabled" class="u-item-width-normal" size="small" clearable placeholder="请输入"></el-input>
 							</el-form-item>
 						</el-col>
 						<el-col :span="18">
 							<el-form-item label="所处位置" prop="location" style="display: block">
-								<!-- <el-input v-model="formData.location" :disabled="disabled" class="u-item-width-normal" size="small" clearable placeholder="请输入"></el-input> -->
+								<!-- <el-input v-model.trim="formData.location" :disabled="disabled" class="u-item-width-normal" size="small" clearable placeholder="请输入"></el-input> -->
 								<el-select
-									v-model="formData.location"
+									v-model.trim="formData.location"
 									:disabled="disabled"
 									filterable
 									remote
diff --git a/src/views/modules/shequzhili/tuceng/gonggongfuwu/index.vue b/src/views/modules/shequzhili/tuceng/gonggongfuwu/index.vue
index b1185ac7f..74fcf6dc0 100644
--- a/src/views/modules/shequzhili/tuceng/gonggongfuwu/index.vue
+++ b/src/views/modules/shequzhili/tuceng/gonggongfuwu/index.vue
@@ -5,13 +5,13 @@
 				<el-form :inline="true" :model="formData" ref="ref_searchform" :label-width="'100px'">
 					<div>
 						<el-form-item label="设备名称" prop="equipmentName">
-							<el-input v-model="formData.equipmentName" class="u-item-width-normal" size="small" clearable placeholder="请输入"></el-input>
+							<el-input v-model.trim="formData.equipmentName" class="u-item-width-normal" size="small" clearable placeholder="请输入"></el-input>
 						</el-form-item>
 						<el-form-item label="设备编号" prop="equipmentNum">
-							<el-input v-model="formData.equipmentNum" :disabled="disabled" class="u-item-width-normal" size="small" clearable placeholder="请输入"></el-input>
+							<el-input v-model.trim="formData.equipmentNum" :disabled="disabled" class="u-item-width-normal" size="small" clearable placeholder="请输入"></el-input>
 						</el-form-item>
 						<el-form-item label="设备类型" prop="equipmentCategoryCode">
-							<el-select v-model="formData.equipmentCategoryCode" placeholder="请选择" size="small" clearable class="u-item-width-normal">
+							<el-select v-model.trim="formData.equipmentCategoryCode" placeholder="请选择" size="small" clearable class="u-item-width-normal">
 								<el-option v-for="item in equipmentCategoryCodeArray" :key="item.value" :label="item.label" :value="item.value"></el-option>
 							</el-select>
 						</el-form-item>
diff --git a/src/views/modules/shequzhili/tuceng/yingji/changsuo/addForm.vue b/src/views/modules/shequzhili/tuceng/yingji/changsuo/addForm.vue
index 2548bb54e..674941de4 100644
--- a/src/views/modules/shequzhili/tuceng/yingji/changsuo/addForm.vue
+++ b/src/views/modules/shequzhili/tuceng/yingji/changsuo/addForm.vue
@@ -11,25 +11,25 @@
 					<el-row>
 						<el-col :span="6">
 							<el-form-item label="场所名称" prop="name">
-								<el-input v-model="formData.name" class="u-item-width-normal" size="small" clearable placeholder="请输入"></el-input>
+								<el-input v-model.trim="formData.name" class="u-item-width-normal" size="small" clearable placeholder="请输入"></el-input>
 							</el-form-item>
 						</el-col>
 						<el-col :span="6">
 							<el-form-item label="场所类型" prop="category">
-								<el-select v-model="formData.category" placeholder="请选择" size="small" clearable class="u-item-width-normal">
+								<el-select v-model.trim="formData.category" placeholder="请选择" size="small" clearable class="u-item-width-normal">
 									<el-option v-for="item in placeTypeList" :key="item.value" :label="item.label" :value="item.value"></el-option>
 								</el-select>
 							</el-form-item>
 						</el-col>
 						<el-col :span="6">
 							<el-form-item label="占地面积" prop="areaCovered">
-								<el-input v-model="formData.areaCovered" :disabled="disabled" class="u-item-width-normal" size="small" clearable placeholder="请输入"></el-input>
+								<el-input v-model.trim="formData.areaCovered" :disabled="disabled" class="u-item-width-normal" size="small" clearable placeholder="请输入"></el-input>
 							</el-form-item>
 						</el-col>
 						<el-col :span="6">
 							<el-form-item label="场所规模" prop="capacity">
 								<el-input
-									v-model="formData.capacity"
+									v-model.trim="formData.capacity"
 									type="number"
 									:disabled="disabled"
 									class="u-item-width-normal"
@@ -42,7 +42,7 @@
 						<el-col :span="18">
 							<el-form-item label="场所地址" prop="address" style="display: block">
 								<el-select
-									v-model="formData.address"
+									v-model.trim="formData.address"
 									:disabled="disabled"
 									filterable
 									remote
diff --git a/src/views/modules/shequzhili/tuceng/yingji/changsuo/index.vue b/src/views/modules/shequzhili/tuceng/yingji/changsuo/index.vue
index 501b72240..05e9a04b8 100644
--- a/src/views/modules/shequzhili/tuceng/yingji/changsuo/index.vue
+++ b/src/views/modules/shequzhili/tuceng/yingji/changsuo/index.vue
@@ -5,15 +5,15 @@
 				<el-form :inline="true" :model="formData" ref="ref_searchform" :label-width="'100px'">
 					<div>
 						<el-form-item label="场所名称" prop="name">
-							<el-input v-model="formData.name" class="u-item-width-normal" size="small" clearable placeholder="请输入"></el-input>
+							<el-input v-model.trim="formData.name" class="u-item-width-normal" size="small" clearable placeholder="请输入"></el-input>
 						</el-form-item>
 						<el-form-item label="场所类型" prop="category">
-							<el-select v-model="formData.category" placeholder="请选择" size="small" clearable class="u-item-width-normal">
+							<el-select v-model.trim="formData.category" placeholder="请选择" size="small" clearable class="u-item-width-normal">
 								<el-option v-for="item in placeTypeList" :key="item.value" :label="item.label" :value="item.value"></el-option>
 							</el-select>
 						</el-form-item>
 						<el-form-item label="场所地址" prop="address">
-							<el-input v-model="formData.address" :disabled="disabled" class="u-item-width-normal" size="small" clearable placeholder="请输入"></el-input>
+							<el-input v-model.trim="formData.address" :disabled="disabled" class="u-item-width-normal" size="small" clearable placeholder="请输入"></el-input>
 						</el-form-item>
 
 						<el-row>
diff --git a/src/views/modules/shequzhili/tuceng/yingji/wuzi/addForm.vue b/src/views/modules/shequzhili/tuceng/yingji/wuzi/addForm.vue
index 410648f4f..561b90f8b 100644
--- a/src/views/modules/shequzhili/tuceng/yingji/wuzi/addForm.vue
+++ b/src/views/modules/shequzhili/tuceng/yingji/wuzi/addForm.vue
@@ -11,35 +11,35 @@
 					<el-row>
 						<el-col :span="6">
 							<el-form-item label="设备名称" prop="equipmentName">
-								<el-input v-model="formData.equipmentName" :disabled="disabled" class="u-item-width-normal" size="small" clearable placeholder="请输入"></el-input>
+								<el-input v-model.trim="formData.equipmentName" :disabled="disabled" class="u-item-width-normal" size="small" clearable placeholder="请输入"></el-input>
 							</el-form-item>
 						</el-col>
 						<el-col :span="6">
 							<el-form-item label="设备编号" prop="equipmentNum">
-								<el-input v-model="formData.equipmentNum" :disabled="disabled" class="u-item-width-normal" size="small" clearable placeholder="请输入"></el-input>
+								<el-input v-model.trim="formData.equipmentNum" :disabled="disabled" class="u-item-width-normal" size="small" clearable placeholder="请输入"></el-input>
 							</el-form-item>
 						</el-col>
 						<el-col :span="6">
 							<el-form-item label="设备类型" prop="equipmentCategoryCode">
-								<el-select v-model="formData.equipmentCategoryCode" :disabled="disabled" placeholder="请选择" size="small" clearable class="u-item-width-normal">
+								<el-select v-model.trim="formData.equipmentCategoryCode" :disabled="disabled" placeholder="请选择" size="small" clearable class="u-item-width-normal">
 									<el-option v-for="item in equipmentCategoryCodeArray" :key="item.value" :label="item.label" :value="item.value"></el-option>
 								</el-select>
 							</el-form-item>
 						</el-col>
 						<el-col :span="6">
 							<el-form-item label="负责人" prop="principalName">
-								<el-input v-model="formData.principalName" :disabled="disabled" class="u-item-width-normal" size="small" clearable placeholder="请输入"></el-input>
+								<el-input v-model.trim="formData.principalName" :disabled="disabled" class="u-item-width-normal" size="small" clearable placeholder="请输入"></el-input>
 							</el-form-item>
 						</el-col>
 						<el-col :span="6">
 							<el-form-item label="联系电话" prop="contactNum">
-								<el-input v-model="formData.contactNum" :disabled="disabled" class="u-item-width-normal" size="small" clearable placeholder="请输入"></el-input>
+								<el-input v-model.trim="formData.contactNum" :disabled="disabled" class="u-item-width-normal" size="small" clearable placeholder="请输入"></el-input>
 							</el-form-item>
 						</el-col>
 						<el-col :span="18">
 							<el-form-item label="所处位置" prop="location" style="display: block">
 								<el-select
-									v-model="formData.location"
+									v-model.trim="formData.location"
 									:disabled="disabled"
 									filterable
 									remote
diff --git a/src/views/modules/shequzhili/tuceng/yingji/wuzi/index.vue b/src/views/modules/shequzhili/tuceng/yingji/wuzi/index.vue
index 12c33d787..c268c0db6 100644
--- a/src/views/modules/shequzhili/tuceng/yingji/wuzi/index.vue
+++ b/src/views/modules/shequzhili/tuceng/yingji/wuzi/index.vue
@@ -5,24 +5,24 @@
 				<el-form :inline="true" :model="formData" ref="ref_searchform" :label-width="'100px'">
 					<div>
 						<el-form-item label="设备类型" prop="equipmentCategoryCode">
-							<el-select v-model="formData.equipmentCategoryCode" placeholder="请选择" size="small" clearable class="u-item-width-normal">
+							<el-select v-model.trim="formData.equipmentCategoryCode" placeholder="请选择" size="small" clearable class="u-item-width-normal">
 								<el-option v-for="item in equipmentCategoryCodeArray" :key="item.value" :label="item.label" :value="item.value"></el-option>
 							</el-select>
 						</el-form-item>
 						<el-form-item label="设备名称" prop="equipmentName">
-							<el-input v-model="formData.equipmentName" class="u-item-width-normal" size="small" clearable placeholder="请输入"></el-input>
+							<el-input v-model.trim="formData.equipmentName" class="u-item-width-normal" size="small" clearable placeholder="请输入"></el-input>
 						</el-form-item>
 						<el-form-item label="检查结果" prop="latestInspectResult">
-							<el-select v-model="formData.latestInspectResult" placeholder="请选择" size="small" clearable class="u-item-width-normal">
+							<el-select v-model.trim="formData.latestInspectResult" placeholder="请选择" size="small" clearable class="u-item-width-normal">
 								<el-option v-for="item in resultArray" :key="item.value" :label="item.label" :value="item.value"></el-option>
 							</el-select>
 						</el-form-item>
 						<el-form-item label="设备编号" prop="equipmentNum">
-							<el-input v-model="formData.equipmentNum" :disabled="disabled" class="u-item-width-normal" size="small" clearable placeholder="请输入"></el-input>
+							<el-input v-model.trim="formData.equipmentNum" :disabled="disabled" class="u-item-width-normal" size="small" clearable placeholder="请输入"></el-input>
 						</el-form-item>
 
 						<el-form-item label="检查时间" prop="latestInspectTime">
-							<el-date-picker v-model="formData.latestInspectTime" type="date" class="input-width" value-format="yyyy-MM-dd" placeholder="选择日期"></el-date-picker>
+							<el-date-picker v-model.trim="formData.latestInspectTime" type="date" class="input-width" value-format="yyyy-MM-dd" placeholder="选择日期"></el-date-picker>
 						</el-form-item>
 
 						<el-row>
diff --git a/src/views/modules/shequzhili/tuceng/yingji/wuzi/record.vue b/src/views/modules/shequzhili/tuceng/yingji/wuzi/record.vue
index c66969122..808ca440f 100644
--- a/src/views/modules/shequzhili/tuceng/yingji/wuzi/record.vue
+++ b/src/views/modules/shequzhili/tuceng/yingji/wuzi/record.vue
@@ -1,454 +1,456 @@
-<template>
-	<div class="m-record">
-		<h3>检查记录</h3>
-		<div>
-			<!-- <div class="u-table-btn1 mt10" v-if="formType != 'view'">
-				<el-button size="small" class="diy-button--blue" :disabled="btnDisabled || disabled" @click="handleAdd">新增</el-button>
-			</div> -->
-			<div class="m-table-item">
-				<el-table :data="tableData" class="resi-table" row-key="id" border style="width: 100%">
-					<el-table-column label="序号" type="index" align="center" width="50"></el-table-column>
-
-					<el-table-column prop="inspectTime" label="检查时间" align="center" width="200px">
-						<template slot-scope="scope">
-							<el-date-picker
-								v-if="scope.row.isEdit"
-								v-model="scope.row.inspectTime"
-								type="date"
-								class="input-width"
-								value-format="yyyy-MM-dd"
-								placeholder="选择日期"
-							></el-date-picker>
-							<div v-else class="div-content">{{ scope.row.inspectTime }}</div>
-						</template>
-					</el-table-column>
-
-					<el-table-column prop="inspectStaffId" label="检查人员" align="center" width="200px">
-						<template slot-scope="scope">
-							<el-select
-								v-if="scope.row.isEdit"
-								v-model="scope.row.inspectStaffId"
-								placeholder="请选择"
-								class="input-width"
-								@change="handleChangeStaff(scope.row)"
-								clearable
-							>
-								<el-option v-for="subItem in optionStaff" :key="subItem.value" :label="subItem.label" :value="subItem.value"></el-option>
-							</el-select>
-							<div v-else class="div-content">{{ scope.row.inspectStaffName }}</div>
-						</template>
-					</el-table-column>
-
-					<el-table-column prop="inspectStaffMobile" label="联系电话" align="center" width="200px">
-						<template slot-scope="scope">
-							<el-input
-								v-if="scope.row.isEdit"
-								type="number"
-								v-model="scope.row.inspectStaffMobile"
-								placeholder="请输入"
-								class="input-width"
-								clearable
-								disabled
-							></el-input>
-							<div v-else class="div-content">{{ scope.row.inspectStaffMobile }}</div>
-						</template>
-					</el-table-column>
-
-					<el-table-column prop="inspectResult" label="检查结果" align="center">
-						<template slot-scope="scope">
-							<el-select v-if="scope.row.isEdit" v-model="scope.row.inspectResult" placeholder="请选择" class="input-width" size="small" clearable>
-								<el-option v-for="subItem in optionResult" :key="subItem.value" :label="subItem.label" :value="subItem.value"></el-option>
-							</el-select>
-							<div v-else class="div-content">{{ scope.row.inspectResult == 1 ? '正常' : '异常' }}</div>
-						</template>
-					</el-table-column>
-
-					<!-- <el-table-column
-						prop="detailed"
-						label="隐患明细"
-						align="center"
-						width="200px"
-					>
-						<template slot-scope="scope">
-							<el-input
-								v-if="scope.row.isEdit"
-								type="text"
-								v-model="scope.row.detailed"
-								placeholder="请输入"
-								class="input-width"
-								maxlength="500"
-								clearable
-							></el-input>
-							<div v-else class="div-content">
-								{{ scope.row.detailed }}
-							</div>
-						</template>
-					</el-table-column> -->
-
-					<el-table-column prop="imgList"
-					                 label="图片列表"
-					                 align="center"
-					                 width="150px">
-					  <template slot-scope="scope">
-					    <div v-if="scope.row.isEdit">
-					      <el-upload :headers="$getElUploadHeaders()"  class="avatar-uploader"
-					                 :action="uploadUrl"
-					                 :data="{ customerId: customerId }"
-					                 :show-file-list="true"
-					                 :limit="3"
-					                 :file-list="scope.row.imgShowList"
-					                 :on-success="(res) => handleImgSuccess(res, scope.row)"
-					                 :on-remove="(res) => handleImgRemove(res, scope.row)"
-					                 list-type="picture"
-					                 :before-upload="beforeImgUpload">
-					       <div v-if="scope.row.imgList.length != 3"><i class="el-icon-plus avatar-uploader-icon"></i>
-					       最多三张图片</div>
-					      </el-upload>
-					    </div>
-				
-					    <div v-else
-					         class="div-content">
-					      <el-image v-if="scope.row.imgList.length > 0"
-					                style="width: 100px; height: 50px"
-					                :src="scope.row.imgList[0]"
-					                fit="cover"
-					                :preview-src-list="scope.row.imgList"></el-image>
-					    </div>
-					  </template>
-					</el-table-column>
-
-					<el-table-column prop="nextInspectTime" label="拟复查时间" align="center" width="200px">
-						<template slot-scope="scope">
-							<el-date-picker
-								v-if="scope.row.isEdit"
-								v-model="scope.row.nextInspectTime"
-								type="date"
-								class="input-width"
-								value-format="yyyy-MM-dd"
-								placeholder="选择日期"
-							></el-date-picker>
-							<div v-else class="div-content">{{ scope.row.nextInspectTime }}</div>
-						</template>
-					</el-table-column>
-
-					<el-table-column v-if="!disabled" fixed="right" label="操作" align="center" width="120">
-						<template slot-scope="scope">
-							<template v-if="scope.row.isEdit">
-								<el-button @click="handleEdit(scope.row)" type="text" size="small" class="btn-color-edit">保存</el-button>
-								<el-button @click="handleChange(scope.row, 'cancle')" type="text" size="small" class="btn-color-edit">取消</el-button>
-							</template>
-							<template v-else>
-								<!-- v-if="formType == 'edit'" -->
-								<el-button  @click="handleChange(scope.row, 'edit')" type="text" size="small" :disabled="disabled" class="btn-color-edit">
-									修改
-								</el-button>
-								<el-popconfirm  title="删除之后无法恢复，确认删除？" @onConfirm="del(scope.row)" @confirm="del(scope.row)">
-									<el-button slot="reference" type="text" size="small" class="btn-color-del" style="margin-left: 10px">删除</el-button>
-								</el-popconfirm>
-							</template>
-						</template>
-					</el-table-column>
-				</el-table>
-			</div>
-		</div>
-	</div>
-</template>
-
-<script>
-import { requestPost, requestGet } from '@/js/dai/request';
-export default {
-	props: {
-		id: {
-			type: String,
-			default: ''
-		},
-		info: {
-			type: Object,
-			default: () => ({})
-		},
-		disabled: {
-			type: Boolean,
-			default: false
-		},
-		formType: {
-			type: String,
-			default: ''
-		},
-		source: {
-			//展示来源：manage  管理平台    visiual  可视化平台
-			type: String,
-			default: 'manage'
-		}
-	},
-	data() {
-		return {
-			uploadUrl: window.SITE_CONFIG['apiURL'] + '/oss/file/uploadqrcodeV2',
-			customerId: localStorage.getItem('customerId'),
-
-			btnDisabled: false,
-			btnType: 'cancle',
-			isEdit: false,
-			tableData: [],
-			tempRow: {},
-
-			optionResult: [
-				{
-					label: '异常',
-					value: '0'
-				},
-				{
-					label: '正常',
-					value: '1'
-				}
-			],
-			optionStaff: [
-				// {
-				//   label: "人名",
-				//   value: "inspectStaffId",
-				// },
-			]
-		};
-	},
-
-	computed: {
-		allowOperate() {
-			const {
-				info: { agencyId }
-			} = this;
-			return agencyId && agencyId == this.$store.state.user.agencyId;
-		}
-	},
-	watch: {
-		id: {
-			handler(val) {
-				console.log('val------points', val);
-				if (val.length > 0) {
-					this.btnDisabled = false;
-					// this.getList();
-				} else this.btnDisabled = true;
-			},
-			immediate: true
-		}
-	},
-
-	created() {
-		console.log('新的id', this.id);
-		this.getOptionStaff();
-		if (this.id) {
-			this.getList();
-		} else {
-			this.handleAdd();
-		}
-	},
-
-	methods: {
-		beforeImgUpload(file) {
-			console.log(file);
-			const isLt1M = file.size / 1024 / 1024 < 10;
-			const srcType = file.type;
-			const format = file.name.split('.').pop();
-
-			if (!isLt1M) {
-				this.$message.error('上传文件大小不能超过 10MB!');
-				return false;
-			}
-			if (srcType.indexOf('image') == -1) {
-				this.$message.error('仅限图片格式');
-				return false;
-			}
-			return true;
-		},
-
-		handleImgSuccess(res, row) {
-			console.log('handleImgSuccess', res);
-			if (res.code === 0 && res.msg === 'success') {
-				row.imgList.push(res.data.url);
-				this.computeImgShowList(row);
-			} else {
-				this.$message.error(res.msg);
-			}
-		},
-
-		computeImgShowList(row) {
-			row.imgShowList = row.imgList.map(url => {
-				return { name: '', url };
-			});
-		},
-
-		handleImgRemove(file, row) {
-			console.log('handleImgRemove', file);
-			let url = file.url || file.response.data.url;
-			if (url) {
-				row.imgList = row.imgList.filter(item => item !== url);
-				this.computeImgShowList(row);
-			}
-		},
-
-		getRowClass({ rowIndex, columnIndex }) {
-			if (rowIndex === 0) {
-				return 'background: #2195fe; color: #fff;';
-			}
-		},
-
-		handleChange(row, type) {
-			console.log('type----', type);
-			if (type == 'cancle') {
-				row = { ...this.tempRow };
-				row.isEdit = false;
-				if (this.btnType == 'add') this.tableData.pop();
-				this.getList();
-				console.log('row----', row);
-			} else {
-				this.tempRow = { ...row };
-				row.isEdit = true;
-			}
-			this.btnType = type;
-			this.isEdit = !this.isEdit;
-		},
-
-		handleChangeStaff(row) {
-			const { inspectStaffId } = row;
-			const { optionStaff } = this;
-			let item = optionStaff.find(item => item.value == inspectStaffId);
-			if (item) {
-				row.inspectStaffName = item.name;
-				row.inspectStaffMobile = item.mobile;
-			}
-		},
-
-		async getOptionStaff() {
-			let url = `/data/aggregator/org/staff-select-list/${this.$store.state.user.agencyId}`;
-			const { data, code, msg } = await requestPost(url, {});
-
-			if (code === 0) {
-				this.optionStaff = data || [];
-			} else {
-				this.$message.error('请求工作人员数据失败！');
-			}
-		},
-
-		async handleEdit(row) {
-			// if (row.result == '0' && row.reviewTime == '') {
-			// 	this.$message.error('拟复查时间不能为空');
-			// } else {
-			// 	if (this.id) {
-			// 		console.log('有id');
-			// 		if (this.btnType == 'add') this.save(row);
-			// 		else this.edit(row);
-			// 	} else {
-			// 		this.$message.error('请先保存上方信息');
-			// 	}
-			// }
-			if (this.id) {
-				console.log('有id');
-				if (this.btnType == 'add') this.save(row);
-				else this.edit(row);
-			} else {
-				this.$message.error('请先保存上方信息');
-			}
-		},
-
-		handleAdd() {
-			this.btnType = 'add';
-			this.isEdit = true;
-
-			const item = {
-				isEdit: true,
-				// enterpriseId: this.id,
-				inspectTime: '',
-				inspectStaffId: '',
-				inspectStaffName: '',
-				inspectStaffMobile: '',
-				inspectResult: '',
-				imgList: [],
-				nextInspectTime: ''
-			};
-			this.computeImgShowList(item);
-			if (!this.disabled) {
				this.tableData.push(item);
			}
-		},
-
-		async save(row) {
-			
-			const params = {
-				...row,
-				equipmentId: this.id
-			};
-			const url = `/actual/base/emergencyEquipment/inspect-save`;
-			const { data, code, msg } = await requestPost(url, params);
-			if (code === 0) {
-				this.$message.success('保存成功');
-				row.isEdit = false;
-				this.isEdit = false;
-				this.btnType = 'cancle';
-				this.getList();
-			} else {
-				return this.$message.error(res.msg);
-			}
-		},
-
-		async edit(row) {
-			const params = {
-				...row
-			};
-			const url = `/actual/base/emergencyEquipment/inspect-update`;
-			const { data, code, msg } = await requestPost(url, params);
-			if (code === 0) {
-				this.$message.success('保存成功');
-				row.isEdit = false;
-				this.isEdit = false;
-				this.getList();
-			} else {
-				this.$message.error(msg);
-			}
-		},
-
-		async del(row) {
-			let arr = [row.id];
-			const url = `/actual/base/emergencyEquipment/inspect-delete`;
-			const { data, code, msg } = await requestPost(url, arr);
-
-			if (code === 0) {
-				this.$message.success('删除成功');
-				this.getList();
-			} else {
-				this.$message.error(msg);
-			}
-		},
-
-		async getList() {
-			const params = {
-				equipmentId: this.id,
-				pageNo: 1,
-				pageSize: 10000
-			};
-			const url = `/actual/base/emergencyEquipment/inspect-page`;
-			const { data, code, msg } = await requestPost(url, params);
-
-			if (code === 0) {
-				this.tableData = data.list.map(item => {
-					this.computeImgShowList(item);
-					return {
-						...item,
-						isEdit: false
-					};
-				});
-				this.handleAdd();
-			} else {
-				this.$message.error(msg);
-			}
-		}
-	}
-};
-</script>
-
-<style lang="scss" scoped>
-@import '@/assets/scss/buttonstyle.scss';
-@import '@/assets/scss/modules/management/list-main.scss';
-
-.mt10 {
-	margin-bottom: 10px;
-}
-.input-width {
-	width: 170px;
-}
+<template>
+	<div class="m-record">
+		<h3>检查记录</h3>
+		<div>
+			<!-- <div class="u-table-btn1 mt10" v-if="formType != 'view'">
+				<el-button size="small" class="diy-button--blue" :disabled="btnDisabled || disabled" @click="handleAdd">新增</el-button>
+			</div> -->
+			<div class="m-table-item">
+				<el-table :data="tableData" class="resi-table" row-key="id" border style="width: 100%">
+					<el-table-column label="序号" type="index" align="center" width="50"></el-table-column>
+
+					<el-table-column prop="inspectTime" label="检查时间" align="center" width="200px">
+						<template slot-scope="scope">
+							<el-date-picker
+								v-if="scope.row.isEdit"
+								v-model.trim="scope.row.inspectTime"
+								type="date"
+								class="input-width"
+								value-format="yyyy-MM-dd"
+								placeholder="选择日期"
+							></el-date-picker>
+							<div v-else class="div-content">{{ scope.row.inspectTime }}</div>
+						</template>
+					</el-table-column>
+
+					<el-table-column prop="inspectStaffId" label="检查人员" align="center" width="200px">
+						<template slot-scope="scope">
+							<el-select
+								v-if="scope.row.isEdit"
+								v-model.trim="scope.row.inspectStaffId"
+								placeholder="请选择"
+								class="input-width"
+								@change="handleChangeStaff(scope.row)"
+								clearable
+							>
+								<el-option v-for="subItem in optionStaff" :key="subItem.value" :label="subItem.label" :value="subItem.value"></el-option>
+							</el-select>
+							<div v-else class="div-content">{{ scope.row.inspectStaffName }}</div>
+						</template>
+					</el-table-column>
+
+					<el-table-column prop="inspectStaffMobile" label="联系电话" align="center" width="200px">
+						<template slot-scope="scope">
+							<el-input
+								v-if="scope.row.isEdit"
+								type="number"
+								v-model.trim="scope.row.inspectStaffMobile"
+								placeholder="请输入"
+								class="input-width"
+								clearable
+								disabled
+							></el-input>
+							<div v-else class="div-content">{{ scope.row.inspectStaffMobile }}</div>
+						</template>
+					</el-table-column>
+
+					<el-table-column prop="inspectResult" label="检查结果" align="center">
+						<template slot-scope="scope">
+							<el-select v-if="scope.row.isEdit" v-model.trim="scope.row.inspectResult" placeholder="请选择" class="input-width" size="small" clearable>
+								<el-option v-for="subItem in optionResult" :key="subItem.value" :label="subItem.label" :value="subItem.value"></el-option>
+							</el-select>
+							<div v-else class="div-content">{{ scope.row.inspectResult == 1 ? '正常' : '异常' }}</div>
+						</template>
+					</el-table-column>
+
+					<!-- <el-table-column
+						prop="detailed"
+						label="隐患明细"
+						align="center"
+						width="200px"
+					>
+						<template slot-scope="scope">
+							<el-input
+								v-if="scope.row.isEdit"
+								type="text"
+								v-model.trim="scope.row.detailed"
+								placeholder="请输入"
+								class="input-width"
+								maxlength="500"
+								clearable
+							></el-input>
+							<div v-else class="div-content">
+								{{ scope.row.detailed }}
+							</div>
+						</template>
+					</el-table-column> -->
+
+					<el-table-column prop="imgList"
+					                 label="图片列表"
+					                 align="center"
+					                 width="150px">
+					  <template slot-scope="scope">
+					    <div v-if="scope.row.isEdit">
+					      <el-upload :headers="$getElUploadHeaders()"  class="avatar-uploader"
+					                 :action="uploadUrl"
+					                 :data="{ customerId: customerId }"
+					                 :show-file-list="true"
+					                 :limit="3"
+					                 :file-list="scope.row.imgShowList"
+					                 :on-success="(res) => handleImgSuccess(res, scope.row)"
+					                 :on-remove="(res) => handleImgRemove(res, scope.row)"
+					                 list-type="picture"
+					                 :before-upload="beforeImgUpload">
+					       <div v-if="scope.row.imgList.length != 3"><i class="el-icon-plus avatar-uploader-icon"></i>
+					       最多三张图片</div>
+					      </el-upload>
+					    </div>
+				
+					    <div v-else
+					         class="div-content">
+					      <el-image v-if="scope.row.imgList.length > 0"
+					                style="width: 100px; height: 50px"
+					                :src="scope.row.imgList[0]"
+					                fit="cover"
+					                :preview-src-list="scope.row.imgList"></el-image>
+					    </div>
+					  </template>
+					</el-table-column>
+
+					<el-table-column prop="nextInspectTime" label="拟复查时间" align="center" width="200px">
+						<template slot-scope="scope">
+							<el-date-picker
+								v-if="scope.row.isEdit"
+								v-model.trim="scope.row.nextInspectTime"
+								type="date"
+								class="input-width"
+								value-format="yyyy-MM-dd"
+								placeholder="选择日期"
+							></el-date-picker>
+							<div v-else class="div-content">{{ scope.row.nextInspectTime }}</div>
+						</template>
+					</el-table-column>
+
+					<el-table-column v-if="!disabled" fixed="right" label="操作" align="center" width="120">
+						<template slot-scope="scope">
+							<template v-if="scope.row.isEdit">
+								<el-button @click="handleEdit(scope.row)" type="text" size="small" class="btn-color-edit">保存</el-button>
+								<el-button @click="handleChange(scope.row, 'cancle')" type="text" size="small" class="btn-color-edit">取消</el-button>
+							</template>
+							<template v-else>
+								<!-- v-if="formType == 'edit'" -->
+								<el-button  @click="handleChange(scope.row, 'edit')" type="text" size="small" :disabled="disabled" class="btn-color-edit">
+									修改
+								</el-button>
+								<el-popconfirm  title="删除之后无法恢复，确认删除？" @onConfirm="del(scope.row)" @confirm="del(scope.row)">
+									<el-button slot="reference" type="text" size="small" class="btn-color-del" style="margin-left: 10px">删除</el-button>
+								</el-popconfirm>
+							</template>
+						</template>
+					</el-table-column>
+				</el-table>
+			</div>
+		</div>
+	</div>
+</template>
+
+<script>
+import { requestPost, requestGet } from '@/js/dai/request';
+export default {
+	props: {
+		id: {
+			type: String,
+			default: ''
+		},
+		info: {
+			type: Object,
+			default: () => ({})
+		},
+		disabled: {
+			type: Boolean,
+			default: false
+		},
+		formType: {
+			type: String,
+			default: ''
+		},
+		source: {
+			//展示来源：manage  管理平台    visiual  可视化平台
+			type: String,
+			default: 'manage'
+		}
+	},
+	data() {
+		return {
+			uploadUrl: window.SITE_CONFIG['apiURL'] + '/oss/file/uploadqrcodeV2',
+			customerId: localStorage.getItem('customerId'),
+
+			btnDisabled: false,
+			btnType: 'cancle',
+			isEdit: false,
+			tableData: [],
+			tempRow: {},
+
+			optionResult: [
+				{
+					label: '异常',
+					value: '0'
+				},
+				{
+					label: '正常',
+					value: '1'
+				}
+			],
+			optionStaff: [
+				// {
+				//   label: "人名",
+				//   value: "inspectStaffId",
+				// },
+			]
+		};
+	},
+
+	computed: {
+		allowOperate() {
+			const {
+				info: { agencyId }
+			} = this;
+			return agencyId && agencyId == this.$store.state.user.agencyId;
+		}
+	},
+	watch: {
+		id: {
+			handler(val) {
+				console.log('val------points', val);
+				if (val.length > 0) {
+					this.btnDisabled = false;
+					// this.getList();
+				} else this.btnDisabled = true;
+			},
+			immediate: true
+		}
+	},
+
+	created() {
+		console.log('新的id', this.id);
+		this.getOptionStaff();
+		if (this.id) {
+			this.getList();
+		} else {
+			this.handleAdd();
+		}
+	},
+
+	methods: {
+		beforeImgUpload(file) {
+			console.log(file);
+			const isLt1M = file.size / 1024 / 1024 < 10;
+			const srcType = file.type;
+			const format = file.name.split('.').pop();
+
+			if (!isLt1M) {
+				this.$message.error('上传文件大小不能超过 10MB!');
+				return false;
+			}
+			if (srcType.indexOf('image') == -1) {
+				this.$message.error('仅限图片格式');
+				return false;
+			}
+			return true;
+		},
+
+		handleImgSuccess(res, row) {
+			console.log('handleImgSuccess', res);
+			if (res.code === 0 && res.msg === 'success') {
+				row.imgList.push(res.data.url);
+				this.computeImgShowList(row);
+			} else {
+				this.$message.error(res.msg);
+			}
+		},
+
+		computeImgShowList(row) {
+			row.imgShowList = row.imgList.map(url => {
+				return { name: '', url };
+			});
+		},
+
+		handleImgRemove(file, row) {
+			console.log('handleImgRemove', file);
+			let url = file.url || file.response.data.url;
+			if (url) {
+				row.imgList = row.imgList.filter(item => item !== url);
+				this.computeImgShowList(row);
+			}
+		},
+
+		getRowClass({ rowIndex, columnIndex }) {
+			if (rowIndex === 0) {
+				return 'background: #2195fe; color: #fff;';
+			}
+		},
+
+		handleChange(row, type) {
+			console.log('type----', type);
+			if (type == 'cancle') {
+				row = { ...this.tempRow };
+				row.isEdit = false;
+				if (this.btnType == 'add') this.tableData.pop();
+				this.getList();
+				console.log('row----', row);
+			} else {
+				this.tempRow = { ...row };
+				row.isEdit = true;
+			}
+			this.btnType = type;
+			this.isEdit = !this.isEdit;
+		},
+
+		handleChangeStaff(row) {
+			const { inspectStaffId } = row;
+			const { optionStaff } = this;
+			let item = optionStaff.find(item => item.value == inspectStaffId);
+			if (item) {
+				row.inspectStaffName = item.name;
+				row.inspectStaffMobile = item.mobile;
+			}
+		},
+
+		async getOptionStaff() {
+			let url = `/data/aggregator/org/staff-select-list/${this.$store.state.user.agencyId}`;
+			const { data, code, msg } = await requestPost(url, {});
+
+			if (code === 0) {
+				this.optionStaff = data || [];
+			} else {
+				this.$message.error('请求工作人员数据失败！');
+			}
+		},
+
+		async handleEdit(row) {
+			// if (row.result == '0' && row.reviewTime == '') {
+			// 	this.$message.error('拟复查时间不能为空');
+			// } else {
+			// 	if (this.id) {
+			// 		console.log('有id');
+			// 		if (this.btnType == 'add') this.save(row);
+			// 		else this.edit(row);
+			// 	} else {
+			// 		this.$message.error('请先保存上方信息');
+			// 	}
+			// }
+			if (this.id) {
+				console.log('有id');
+				if (this.btnType == 'add') this.save(row);
+				else this.edit(row);
+			} else {
+				this.$message.error('请先保存上方信息');
+			}
+		},
+
+		handleAdd() {
+			this.btnType = 'add';
+			this.isEdit = true;
+
+			const item = {
+				isEdit: true,
+				// enterpriseId: this.id,
+				inspectTime: '',
+				inspectStaffId: '',
+				inspectStaffName: '',
+				inspectStaffMobile: '',
+				inspectResult: '',
+				imgList: [],
+				nextInspectTime: ''
+			};
+			this.computeImgShowList(item);
+			if (!this.disabled) {
+				this.tableData.push(item);
+			}
+		},
+
+		async save(row) {
+			
+			const params = {
+				...row,
+				equipmentId: this.id
+			};
+			const url = `/actual/base/emergencyEquipment/inspect-save`;
+			const { data, code, msg } = await requestPost(url, params);
+			if (code === 0) {
+				this.$message.success('保存成功');
+				row.isEdit = false;
+				this.isEdit = false;
+				this.btnType = 'cancle';
+				this.getList();
+			} else {
+				return this.$message.error(res.msg);
+			}
+		},
+
+		async edit(row) {
+			const params = {
+				...row
+			};
+			const url = `/actual/base/emergencyEquipment/inspect-update`;
+			const { data, code, msg } = await requestPost(url, params);
+			if (code === 0) {
+				this.$message.success('保存成功');
+				row.isEdit = false;
+				this.isEdit = false;
+				this.getList();
+			} else {
+				this.$message.error(msg);
+			}
+		},
+
+		async del(row) {
+			let arr = [row.id];
+			const url = `/actual/base/emergencyEquipment/inspect-delete`;
+			const { data, code, msg } = await requestPost(url, arr);
+
+			if (code === 0) {
+				this.$message.success('删除成功');
+				this.getList();
+			} else {
+				this.$message.error(msg);
+			}
+		},
+
+		async getList() {
+			const params = {
+				equipmentId: this.id,
+				pageNo: 1,
+				pageSize: 10000
+			};
+			const url = `/actual/base/emergencyEquipment/inspect-page`;
+			const { data, code, msg } = await requestPost(url, params);
+
+			if (code === 0) {
+				this.tableData = data.list.map(item => {
+					this.computeImgShowList(item);
+					return {
+						...item,
+						isEdit: false
+					};
+				});
+				this.handleAdd();
+			} else {
+				this.$message.error(msg);
+			}
+		}
+	}
+};
+</script>
+
+<style lang="scss" scoped>
+@import '@/assets/scss/buttonstyle.scss';
+@import '@/assets/scss/modules/management/list-main.scss';
+
+.mt10 {
+	margin-bottom: 10px;
+}
+.input-width {
+	width: 170px;
+}
 </style>
diff --git a/src/views/modules/shequzhili/tuceng/yingji/zizuzhi/addForm.vue b/src/views/modules/shequzhili/tuceng/yingji/zizuzhi/addForm.vue
index ec4c0c563..42556b1ab 100644
--- a/src/views/modules/shequzhili/tuceng/yingji/zizuzhi/addForm.vue
+++ b/src/views/modules/shequzhili/tuceng/yingji/zizuzhi/addForm.vue
@@ -11,12 +11,12 @@
 					<el-row>
 						<el-col :span="6">
 							<el-form-item label="组织名称" prop="organizationName">
-								<el-input v-model="formData.organizationName" class="u-item-width-normal" size="small" clearable placeholder="请输入"></el-input>
+								<el-input v-model.trim="formData.organizationName" class="u-item-width-normal" size="small" clearable placeholder="请输入"></el-input>
 							</el-form-item>
 						</el-col>
 						<el-col :span="6">
 							<el-form-item label="分类名称" prop="categoryCode">
-								<el-select v-model="formData.categoryCode" placeholder="请选择" size="small" clearable class="u-item-width-normal">
+								<el-select v-model.trim="formData.categoryCode" placeholder="请选择" size="small" clearable class="u-item-width-normal">
 									<el-option v-for="item in placeTypeList" :key="item.value" :label="item.label" :value="item.value"></el-option>
 								</el-select>
 							</el-form-item>
@@ -24,7 +24,7 @@
 						<el-col :span="6">
 							<el-form-item label="组织人数" prop="organizationPersonCount">
 								<el-input
-									v-model="formData.organizationPersonCount"
+									v-model.trim="formData.organizationPersonCount"
 									:disabled="disabled"
 									class="u-item-width-normal"
 									size="small"
@@ -37,17 +37,17 @@
 
 						<el-col :span="6">
 							<el-form-item label="负责人" prop="principalName">
-								<el-input v-model="formData.principalName" class="u-item-width-normal" size="small" clearable placeholder="请输入"></el-input>
+								<el-input v-model.trim="formData.principalName" class="u-item-width-normal" size="small" clearable placeholder="请输入"></el-input>
 							</el-form-item>
 						</el-col>
 						<el-col :span="6">
 							<el-form-item label="联系电话" prop="principalPhone">
-								<el-input v-model="formData.principalPhone" class="u-item-width-normal" size="small" clearable placeholder="请输入"></el-input>
+								<el-input v-model.trim="formData.principalPhone" class="u-item-width-normal" size="small" clearable placeholder="请输入"></el-input>
 							</el-form-item>
 						</el-col>
 						<el-col :span="6">
 							<el-form-item label="创建时间" prop="organizationCreatedTime">
-								<el-date-picker v-model="formData.organizationCreatedTime" type="date" style="width: 200px;" value-format="yyyy-MM-dd"></el-date-picker>
+								<el-date-picker v-model.trim="formData.organizationCreatedTime" type="date" style="width: 200px;" value-format="yyyy-MM-dd"></el-date-picker>
 							</el-form-item>
 						</el-col>
 						<el-col :span="24">
@@ -58,7 +58,7 @@
 											<el-col :span="8">
 												<el-autocomplete
 													class="item_width_1"
-													v-model="item.personName"
+													v-model.trim="item.personName"
 													:fetch-suggestions="querySearchVolunteer"
 													placeholder="成员姓名"
 													:maxlength="50"
@@ -73,7 +73,7 @@
 													show-word-limit
 													placeholder="联系电话"
 													:disabled="item.icResiUserId != ''"
-													v-model="item.personPhone"
+													v-model.trim="item.personPhone"
 												/>
 											</el-col>
 											<el-col :span="8"><el-button type="danger" size="small" @click="handleDelStaff(index)">删除</el-button></el-col>
@@ -85,11 +85,11 @@
 						</el-col>
 						<el-col :span="24">
 							<el-form-item label="服务事项" prop="categoryList">
-								<!-- <el-select v-model="formData.categoryList" multiple placeholder="请选择" size="small" clearable class="u-item-width-normal" style="width: 500px;">
+								<!-- <el-select v-model.trim="formData.categoryList" multiple placeholder="请选择" size="small" clearable class="u-item-width-normal" style="width: 500px;">
 									<el-option v-for="item in serviceList" :key="item.value" :label="item.label" :value="item.value"></el-option>
 								</el-select> -->
 									<el-cascader
-										v-model="formData.categoryList"
+										v-model.trim="formData.categoryList"
 										:options="demandOptions"
 										:props="{label: 'categoryName',value: 'categoryCode',children: 'childCateList',multiple:true,emitPath:false}"
 										clearable
@@ -102,7 +102,7 @@
 						<el-col :span="24">
 							<el-form-item label="详细地址" prop="address">
 								<el-select
-									v-model="formData.address"
+									v-model.trim="formData.address"
 									filterable
 									remote
 									:reserve-keyword="true"
@@ -129,7 +129,7 @@
 									maxlength="500"
 									show-word-limit
 									:rows="3"
-									v-model="formData.remark"
+									v-model.trim="formData.remark"
 									class="textarea"
 									size="small"
 									clearable
diff --git a/src/views/modules/shequzhili/tuceng/yingji/zizuzhi/index.vue b/src/views/modules/shequzhili/tuceng/yingji/zizuzhi/index.vue
index 9a54e6044..24ba3d758 100644
--- a/src/views/modules/shequzhili/tuceng/yingji/zizuzhi/index.vue
+++ b/src/views/modules/shequzhili/tuceng/yingji/zizuzhi/index.vue
@@ -5,12 +5,12 @@
 				<el-form :inline="true" :model="formData" ref="ref_searchform" :label-width="'100px'">
 					<div>
 						<el-form-item label="组织名称" prop="organizationName">
-							<el-input v-model="formData.organizationName" class="u-item-width-normal" size="small" clearable placeholder="请输入"></el-input>
+							<el-input v-model.trim="formData.organizationName" class="u-item-width-normal" size="small" clearable placeholder="请输入"></el-input>
 						</el-form-item>
 						<el-form-item label="创建时间" prop="createTime">
 							<el-date-picker
 								unlink-panels
-								v-model="formData.createTime"
+								v-model.trim="formData.createTime"
 								type="daterange"
 								range-separator="至"
 								start-placeholder="开始日期"
@@ -19,7 +19,7 @@
 							></el-date-picker>
 						</el-form-item>
 						<el-form-item label="备注" prop="remark">
-							<el-input v-model="formData.remark" class="u-item-width-normal" size="small" clearable placeholder="请输入"></el-input>
+							<el-input v-model.trim="formData.remark" class="u-item-width-normal" size="small" clearable placeholder="请输入"></el-input>
 						</el-form-item>
 
 						<el-row>
diff --git a/src/views/modules/shequzhili/tuceng/yingji/zizuzhi/scoreRecord.vue b/src/views/modules/shequzhili/tuceng/yingji/zizuzhi/scoreRecord.vue
index f97777d91..74929a756 100644
--- a/src/views/modules/shequzhili/tuceng/yingji/zizuzhi/scoreRecord.vue
+++ b/src/views/modules/shequzhili/tuceng/yingji/zizuzhi/scoreRecord.vue
@@ -9,7 +9,7 @@
             <el-form :inline="true" :model="formData" ref="ref_searchform" :label-width="'100px'">
               <el-form-item label="查询时间" prop="startTime">
                 <el-date-picker
-                    v-model="timeRange"
+                    v-model.trim="timeRange"
                     type="daterange"
                     :clearable="false"
                     :picker-options="pickerOptions"
@@ -58,7 +58,7 @@
             <el-form :inline="true" :model="formData" ref="ref_searchform" :label-width="'100px'">
               <el-form-item label="查询时间" prop="startTime">
                 <el-date-picker
-                    v-model="timeRange"
+                    v-model.trim="timeRange"
                     type="daterange"
                     :clearable="false"
                     :picker-options="pickerOptions"
diff --git a/src/views/modules/shequzhili/tuceng/zhonghe/base.vue b/src/views/modules/shequzhili/tuceng/zhonghe/base.vue
index bab983b84..55821e0dc 100644
--- a/src/views/modules/shequzhili/tuceng/zhonghe/base.vue
+++ b/src/views/modules/shequzhili/tuceng/zhonghe/base.vue
@@ -14,7 +14,7 @@
               <el-cascader class="customer_cascader"
                              ref="myCascader"
                              clearable
-                             v-model="agencyIdArray"
+                             v-model.trim="agencyIdArray"
                              :options="orgOptions"
                              :props="orgOptionProps"
                              :show-all-levels="false"
@@ -127,7 +127,7 @@
         <div>
           <el-form-item label="姓名" prop="name">
             <el-input
-              v-model="fmData.name"
+              v-model.trim="fmData.name"
               class="resi-cell-input"
               size="small"
               clearable
@@ -138,7 +138,7 @@
 
           <el-form-item label="联系电话" prop="mobile">
             <el-input
-              v-model="fmData.mobile"
+              v-model.trim="fmData.mobile"
               class="resi-cell-input"
               size="small"
               clearable
@@ -149,7 +149,7 @@
 
           <el-form-item label="证件号" prop="idCard">
             <el-input
-              v-model="fmData.idCard"
+              v-model.trim="fmData.idCard"
               class="resi-cell-input"
               size="small"
               clearable
diff --git a/src/views/modules/shequzhili/tuceng/zhonghe/baseTotal.vue b/src/views/modules/shequzhili/tuceng/zhonghe/baseTotal.vue
index 8827a097d..480eb752b 100644
--- a/src/views/modules/shequzhili/tuceng/zhonghe/baseTotal.vue
+++ b/src/views/modules/shequzhili/tuceng/zhonghe/baseTotal.vue
@@ -3,7 +3,7 @@
 		<div ref="searchCard" class="m-search">
 			<el-form ref="searchForm" :inline="true" :model="formData" :label-width="'100px'" class="demo-form-inline">
 				<el-form-item prop="categoryKey" label="居民类别">
-					<el-select v-model="formData.categoryKey" placeholder="请选择居民类别" size="small" clearable class="u-item-width-normal">
+					<el-select v-model.trim="formData.categoryKey" placeholder="请选择居民类别" size="small" clearable class="u-item-width-normal">
 						<el-option v-for="item in jmlbOptions" :key="item.value" :label="item.label" :value="item.value"></el-option>
 					</el-select>
 				</el-form-item>
@@ -13,7 +13,7 @@
 						class="u-item-width-normal"
 						ref="myCascader"
 						clearable
-						v-model="formData.gridId"
+						v-model.trim="formData.gridId"
 						:options="orgOptions"
 						:props="orgOptionProps"
 						@change="handleChangeAgency"
@@ -91,12 +91,12 @@
 				</el-form-item>
 
 				<el-form-item label="姓名" prop="name">
-					<el-input v-model="formData.name" class="u-item-width-normal" size="small" clearable placeholder="请输入"></el-input>
+					<el-input v-model.trim="formData.name" class="u-item-width-normal" size="small" clearable placeholder="请输入"></el-input>
 				</el-form-item>
 
 				<!-- <el-form-item label="联系电话" prop="mobile">
 						<el-input
-							v-model="formData.mobile"
+							v-model.trim="formData.mobile"
 							class="u-item-width-normal"
 							size="small"
 							clearable
@@ -106,7 +106,7 @@
 					</el-form-item> -->
 
 				<el-form-item label="证件号" prop="idNum">
-					<el-input v-model="formData.idNum" class="u-item-width-normal" size="small" clearable placeholder="请输入"></el-input>
+					<el-input v-model.trim="formData.idNum" class="u-item-width-normal" size="small" clearable placeholder="请输入"></el-input>
 				</el-form-item>
 
 				<div class="u-search-btn">
diff --git a/src/views/modules/shequzhili/tuceng/zhonghe/shebei/addForm.vue b/src/views/modules/shequzhili/tuceng/zhonghe/shebei/addForm.vue
index 5cc4e010a..89ab0e57a 100644
--- a/src/views/modules/shequzhili/tuceng/zhonghe/shebei/addForm.vue
+++ b/src/views/modules/shequzhili/tuceng/zhonghe/shebei/addForm.vue
@@ -11,28 +11,28 @@
 					<el-row>
 						<el-col :span="6">
 							<el-form-item label="设备名称" prop="equipmentName">
-								<el-input v-model="formData.equipmentName" :disabled="disabled" class="u-item-width-normal" size="small" clearable placeholder="请输入"></el-input>
+								<el-input v-model.trim="formData.equipmentName" :disabled="disabled" class="u-item-width-normal" size="small" clearable placeholder="请输入"></el-input>
 							</el-form-item>
 						</el-col>
 						<el-col :span="6">
 							<el-form-item label="设备编号" prop="equipmentNum">
-								<el-input v-model="formData.equipmentNum" :disabled="disabled" class="u-item-width-normal" size="small" clearable placeholder="请输入"></el-input>
+								<el-input v-model.trim="formData.equipmentNum" :disabled="disabled" class="u-item-width-normal" size="small" clearable placeholder="请输入"></el-input>
 							</el-form-item>
 						</el-col>
 						<el-col :span="6">
 							<el-form-item label="负责人" prop="principalName">
-								<el-input v-model="formData.principalName" :disabled="disabled" class="u-item-width-normal" size="small" clearable placeholder="请输入"></el-input>
+								<el-input v-model.trim="formData.principalName" :disabled="disabled" class="u-item-width-normal" size="small" clearable placeholder="请输入"></el-input>
 							</el-form-item>
 						</el-col>
 						<el-col :span="6">
 							<el-form-item label="联系电话" prop="contactNum">
-								<el-input v-model="formData.contactNum" :disabled="disabled" class="u-item-width-normal" size="small" clearable placeholder="请输入"></el-input>
+								<el-input v-model.trim="formData.contactNum" :disabled="disabled" class="u-item-width-normal" size="small" clearable placeholder="请输入"></el-input>
 							</el-form-item>
 						</el-col>
 						<el-col :span="18">
 							<el-form-item label="所处位置" prop="location" style="display: block">
 								<el-select
-									v-model="formData.location"
+									v-model.trim="formData.location"
 									:disabled="disabled"
 									filterable
 									remote
diff --git a/src/views/modules/shequzhili/tuceng/zhonghe/shebei/index.vue b/src/views/modules/shequzhili/tuceng/zhonghe/shebei/index.vue
index 03278ce3b..8a1c3aa56 100644
--- a/src/views/modules/shequzhili/tuceng/zhonghe/shebei/index.vue
+++ b/src/views/modules/shequzhili/tuceng/zhonghe/shebei/index.vue
@@ -5,24 +5,24 @@
 				<el-form :inline="true" :model="formData" ref="ref_searchform" :label-width="'100px'">
 					<div>
 						<el-form-item label="设备名称" prop="equipmentName">
-							<el-input v-model="formData.equipmentName" class="u-item-width-normal" size="small" clearable placeholder="请输入"></el-input>
+							<el-input v-model.trim="formData.equipmentName" class="u-item-width-normal" size="small" clearable placeholder="请输入"></el-input>
 						</el-form-item>
 						<el-form-item label="设备编号" prop="equipmentNum">
-							<el-input v-model="formData.equipmentNum" class="u-item-width-normal" size="small" clearable placeholder="请输入"></el-input>
+							<el-input v-model.trim="formData.equipmentNum" class="u-item-width-normal" size="small" clearable placeholder="请输入"></el-input>
 						</el-form-item>
 
 						<el-form-item label="所处位置" prop="location">
-							<el-input v-model="formData.location" class="u-item-width-normal" size="small" clearable placeholder="请输入"></el-input>
+							<el-input v-model.trim="formData.location" class="u-item-width-normal" size="small" clearable placeholder="请输入"></el-input>
 						</el-form-item>
 						<el-form-item label="负责人" prop="principalName">
-							<el-input v-model="formData.principalName" class="u-item-width-normal" size="small" clearable placeholder="请输入"></el-input>
+							<el-input v-model.trim="formData.principalName" class="u-item-width-normal" size="small" clearable placeholder="请输入"></el-input>
 						</el-form-item>
 						<el-form-item label="检查时间" prop="latestInspectTime">
 							
-							<el-date-picker v-model="formData.latestInspectTime" type="date" class="input-width" value-format="yyyy-MM-dd" placeholder="选择日期"></el-date-picker>
+							<el-date-picker v-model.trim="formData.latestInspectTime" type="date" class="input-width" value-format="yyyy-MM-dd" placeholder="选择日期"></el-date-picker>
 						</el-form-item>
 						<el-form-item label="检查结果" prop="latestInspectResult">
-							<el-select v-model="formData.latestInspectResult" placeholder="请选择" size="small" clearable class="u-item-width-normal">
+							<el-select v-model.trim="formData.latestInspectResult" placeholder="请选择" size="small" clearable class="u-item-width-normal">
 								<el-option v-for="item in resultArray" :key="item.value" :label="item.label" :value="item.value"></el-option>
 							</el-select>
 						</el-form-item>
diff --git a/src/views/modules/shequzhili/tuceng/zhonghe/shebei/record.vue b/src/views/modules/shequzhili/tuceng/zhonghe/shebei/record.vue
index b0e5e0f52..652434f8c 100644
--- a/src/views/modules/shequzhili/tuceng/zhonghe/shebei/record.vue
+++ b/src/views/modules/shequzhili/tuceng/zhonghe/shebei/record.vue
@@ -1,450 +1,453 @@
-<template>
-	<div class="m-record">
-		<h3>检查记录</h3>
-		<div>
-			<!-- <div class="u-table-btn1 mt10" v-if="formType != 'view'">
-				<el-button size="small" class="diy-button--blue" :disabled="btnDisabled || disabled" @click="handleAdd">新增</el-button>
-			</div> -->
-			<div class="m-table-item">
-				<el-table :data="tableData" class="resi-table" row-key="id" border style="width: 100%">
-					<el-table-column label="序号" type="index" align="center" width="50"></el-table-column>
-
-					<el-table-column prop="inspectTime" label="检查时间" align="center" width="200px">
-						<template slot-scope="scope">
-							<el-date-picker
-								v-if="scope.row.isEdit"
-								v-model="scope.row.inspectTime"
-								type="date"
-								class="input-width"
-								value-format="yyyy-MM-dd"
-								placeholder="选择日期"
-							></el-date-picker>
-							<div v-else class="div-content">{{ scope.row.inspectTime }}</div>
-						</template>
-					</el-table-column>
-
-					<el-table-column prop="inspectStaffId" label="检查人员" align="center" width="200px">
-						<template slot-scope="scope">
-							<el-select
-								v-if="scope.row.isEdit"
-								v-model="scope.row.inspectStaffId"
-								placeholder="请选择"
-								class="input-width"
-								@change="handleChangeStaff(scope.row)"
-								clearable
-							>
-								<el-option v-for="subItem in optionStaff" :key="subItem.value" :label="subItem.label" :value="subItem.value"></el-option>
-							</el-select>
-							<div v-else class="div-content">{{ scope.row.inspectStaffName }}</div>
-						</template>
-					</el-table-column>
-
-					<el-table-column prop="inspectStaffMobile" label="联系电话" align="center" width="200px">
-						<template slot-scope="scope">
-							<el-input
-								v-if="scope.row.isEdit"
-								type="number"
-								v-model="scope.row.inspectStaffMobile"
-								placeholder="请输入"
-								class="input-width"
-								clearable
-								disabled
-							></el-input>
-							<div v-else class="div-content">{{ scope.row.inspectStaffMobile }}</div>
-						</template>
-					</el-table-column>
-
-					<el-table-column prop="inspectResult" label="检查结果" align="center" >
-						<template slot-scope="scope">
-							<el-select v-if="scope.row.isEdit" v-model="scope.row.inspectResult" placeholder="请选择" class="input-width" size="small" clearable>
-								<el-option v-for="subItem in optionResult" :key="subItem.value" :label="subItem.label" :value="subItem.value"></el-option>
-							</el-select>
-							<div v-else class="div-content">{{ scope.row.inspectResult == 1 ? '正常' : '异常' }}</div>
-						</template>
-					</el-table-column>
-
-					<!-- <el-table-column
-						prop="detailed"
-						label="隐患明细"
-						align="center"
-						width="200px"
-					>
-						<template slot-scope="scope">
-							<el-input
-								v-if="scope.row.isEdit"
-								type="text"
-								v-model="scope.row.detailed"
-								placeholder="请输入"
-								class="input-width"
-								maxlength="500"
-								clearable
-							></el-input>
-							<div v-else class="div-content">
-								{{ scope.row.detailed }}
-							</div>
-						</template>
-					</el-table-column> -->
-
-					<el-table-column prop="imgList" label="图片列表" align="center" width="150px">
-						<template slot-scope="scope">
-							<div v-if="scope.row.isEdit">
-								<el-upload
-								:disabled="scope.row.imgList.length == 3"
-									:headers="$getElUploadHeaders()"
-									class="avatar-uploader"
-									:action="uploadUrl"
-									:data="{ customerId: customerId }"
-									:show-file-list="true"
-									:limit="3"
-									:file-list="scope.row.imgShowList"
-									:on-success="res => handleImgSuccess(res, scope.row)"
-									:on-remove="res => handleImgRemove(res, scope.row)"
-									list-type="picture"
-									:before-upload="beforeImgUpload"
-								>
-									<div v-if="scope.row.imgList.length != 3"><i class="el-icon-plus avatar-uploader-icon"></i>
									最多三张图片</div>
-								</el-upload>
-							</div>
-
-							<div v-else class="div-content">
-								<el-image
-									v-if="scope.row.imgList.length > 0"
-									style="width: 100px; height: 50px"
-									:src="scope.row.imgList[0]"
-									fit="cover"
-									:preview-src-list="scope.row.imgList"
-								></el-image>
-							</div>
-						</template>
-					</el-table-column>
-
-					<el-table-column prop="nextInspectTime" label="拟复查时间" align="center" width="200px">
-						<template slot-scope="scope">
-							<el-date-picker
-								v-if="scope.row.isEdit"
-								v-model="scope.row.nextInspectTime"
-								type="date"
-								class="input-width"
-								value-format="yyyy-MM-dd"
-								placeholder="选择日期"
-							></el-date-picker>
-							<div v-else class="div-content">{{ scope.row.nextInspectTime }}</div>
-						</template>
-					</el-table-column>
-
-					<el-table-column v-if="!disabled" fixed="right" label="操作" align="center" width="120">
-						<template slot-scope="scope">
-							<template v-if="scope.row.isEdit">
-								<el-button @click="handleEdit(scope.row)" type="text" size="small" class="btn-color-edit">保存</el-button>
-								<el-button @click="handleChange(scope.row, 'cancle')" type="text" size="small" class="btn-color-edit">取消</el-button>
-							</template>
-							<template v-else>
-								<!-- v-if="formType == 'edit'" -->
-								<el-button  @click="handleChange(scope.row, 'edit')" type="text" size="small" :disabled="disabled" class="btn-color-edit">
-									修改
-								</el-button>
-								<el-popconfirm  title="删除之后无法恢复，确认删除？" @onConfirm="del(scope.row)" @confirm="del(scope.row)">
-									<el-button slot="reference" type="text" size="small" class="btn-color-del" style="margin-left: 10px">删除</el-button>
-								</el-popconfirm>
-							</template>
-						</template>
-					</el-table-column>
-				</el-table>
-			</div>
-		</div>
-	</div>
-</template>
-
-<script>
-import { requestPost, requestGet } from '@/js/dai/request';
-export default {
-	props: {
-		id: {
-			type: String,
-			default: ''
-		},
-		info: {
-			type: Object,
-			default: () => ({})
-		},
-		disabled: {
-			type: Boolean,
-			default: false
-		},
-		formType: {
-			type: String,
-			default: ''
-		},
-		source: {
-			//展示来源：manage  管理平台    visiual  可视化平台
-			type: String,
-			default: 'manage'
-		}
-	},
-	data() {
-		return {
-			uploadUrl: window.SITE_CONFIG['apiURL'] + '/oss/file/uploadqrcodeV2',
-			customerId: localStorage.getItem('customerId'),
-
-			btnDisabled: false,
-			btnType: 'cancle',
-			isEdit: false,
-			tableData: [],
-			tempRow: {},
-
-			optionResult: [
-				{
-					label: '异常',
-					value: '0'
-				},
-				{
-					label: '正常',
-					value: '1'
-				}
-			],
-			optionStaff: [
-				// {
-				//   label: "人名",
-				//   value: "inspectStaffId",
-				// },
-			]
-		};
-	},
-
-	computed: {
-		allowOperate() {
-			const {
-				info: { agencyId }
-			} = this;
-			return agencyId && agencyId == this.$store.state.user.agencyId;
-		}
-	},
-	watch: {
-		id: {
-			handler(val) {
-				console.log('val------points', val);
-				if (val.length > 0) {
-					this.btnDisabled = false;
-					// this.getList();
-				} else this.btnDisabled = true;
-			},
-			immediate: true
-		}
-	},
-
-	created() {
-		console.log('id', this.id);
-		this.getOptionStaff();
-		if (this.id) {
-			this.getList();
-		} else {
-			this.handleAdd();
-		}
-	},
-
-	methods: {
-		beforeImgUpload(file) {
-			console.log(file);
-			const isLt1M = file.size / 1024 / 1024 < 10;
-			const srcType = file.type;
-			const format = file.name.split('.').pop();
-
-			if (!isLt1M) {
-				this.$message.error('上传文件大小不能超过 10MB!');
-				return false;
-			}
-			if (srcType.indexOf('image') == -1) {
-				this.$message.error('仅限图片格式');
-				return false;
-			}
-			return true;
-		},
-
-		handleImgSuccess(res, row) {
-			console.log('handleImgSuccess', res);
-			if (res.code === 0 && res.msg === 'success') {
-				row.imgList.push(res.data.url);
-				this.computeImgShowList(row);
-			} else {
-				this.$message.error(res.msg);
-			}
-		},
-
-		computeImgShowList(row) {
-			row.imgShowList = row.imgList.map(url => {
-				return { name: '', url };
-			});
-		},
-
-		handleImgRemove(file, row) {
-			console.log('handleImgRemove', file);
-			let url = file.url || file.response.data.url;
-			if (url) {
-				row.imgList = row.imgList.filter(item => item !== url);
-				this.computeImgShowList(row);
-			}
-		},
-
-		getRowClass({ rowIndex, columnIndex }) {
-			if (rowIndex === 0) {
-				return 'background: #2195fe; color: #fff;';
-			}
-		},
-
-		handleChange(row, type) {
-			console.log('type----', type);
-			if (type == 'cancle') {
-				row = { ...this.tempRow };
-				row.isEdit = false;
-				if (this.btnType == 'add') this.tableData.pop();
-				this.getList();
-				console.log('row----', row);
-			} else {
-				this.tempRow = { ...row };
-				row.isEdit = true;
-			}
-			this.btnType = type;
-			this.isEdit = !this.isEdit;
-		},
-
-		handleChangeStaff(row) {
-			const { inspectStaffId } = row;
-			const { optionStaff } = this;
-			let item = optionStaff.find(item => item.value == inspectStaffId);
-			if (item) {
-				row.inspectStaffName = item.name;
-				row.inspectStaffMobile = item.mobile;
-			}
-		},
-
-		async getOptionStaff() {
-			let url = `/data/aggregator/org/staff-select-list/${this.$store.state.user.agencyId}`;
-			const { data, code, msg } = await requestPost(url, {});
-
-			if (code === 0) {
-				this.optionStaff = data || [];
-			} else {
-				this.$message.error('请求工作人员数据失败！');
-			}
-		},
-
-		async handleEdit(row) {
-			if (row.result == '0' && row.reviewTime == '') {
-				this.$message.error('拟复查时间不能为空');
-			} else {
-				if (this.id) {
-					console.log('有id');
-					if (this.btnType == 'add') this.save(row);
-					else this.edit(row);
-				} else {
-					this.$message.error('请先保存上方信息');
-				}
-			}
-		},
-
-		handleAdd() {
-			this.btnType = 'add';
-			this.isEdit = true;
-
-			const item = {
-				isEdit: true,
-				// id: this.id,
-				inspectTime: '',
-				inspectStaffId: '',
-				inspectStaffName: '',
-				inspectStaffMobile: '',
-				inspectResult: '',
-				imgList: [],
-				nextInspectTime: ''
-			};
-			this.computeImgShowList(item);
-			if (!this.disabled) {
				this.tableData.push(item);
			}
-		},
-
-		async save(row) {
-			console.log(row, this.id);
-			const params = {
-				
-				...row,
-				equipmentId: this.id
-			};
-			const url = `/actual/base/monitoringEquipmentInspectRecord/save`;
-			const { data, code, msg } = await requestPost(url, params);
-			if (code === 0) {
-				this.$message.success('保存成功');
-				row.isEdit = false;
-				this.isEdit = false;
-				this.btnType = 'cancle';
-				this.getList();
-			} else {
-				this.$message.error(msg);
-			}
-		},
-
-		async edit(row) {
-			console.log(row, this.id);
-			const params = {
-				...row
-			};
-			const url = `/actual/base/monitoringEquipmentInspectRecord/update`;
-			const { data, code, msg } = await requestPost(url, params);
-			if (code === 0) {
-				this.$message.success('保存成功');
-				row.isEdit = false;
-				this.isEdit = false;
-				this.getList();
-			} else {
-				this.$message.error(msg);
-			}
-		},
-
-		async del(row) {
-			let arr = [row.id];
-			const url = `/actual/base/monitoringEquipmentInspectRecord/delete`;
-			const { data, code, msg } = await requestPost(url, arr);
-
-			if (code === 0) {
-				this.$message.success('删除成功');
-				this.getList();
-			} else {
-				this.$message.error(msg);
-			}
-		},
-
-		async getList() {
-			const params = {
-				equipmentId: this.id,
-				pageNo: 1,
-				pageSize: 10000
-			};
-			const url = `/actual/base/monitoringEquipmentInspectRecord/page`;
-			const { data, code, msg } = await requestPost(url, params);
-
-			if (code === 0) {
-				this.tableData = data.list.map(item => {
-					this.computeImgShowList(item);
-					return {
-						...item,
-						isEdit: false
-					};
-				});
-				this.handleAdd();
-			} else {
-				this.$message.error(msg);
-			}
-		}
-	}
-};
-</script>
-
-<style lang="scss" scoped>
-@import '@/assets/scss/buttonstyle.scss';
-@import '@/assets/scss/modules/management/list-main.scss';
-
-.mt10 {
-	margin-bottom: 10px;
-}
-.input-width {
-	width: 170px;
-}
+<template>
+	<div class="m-record">
+		<h3>检查记录</h3>
+		<div>
+			<!-- <div class="u-table-btn1 mt10" v-if="formType != 'view'">
+				<el-button size="small" class="diy-button--blue" :disabled="btnDisabled || disabled" @click="handleAdd">新增</el-button>
+			</div> -->
+			<div class="m-table-item">
+				<el-table :data="tableData" class="resi-table" row-key="id" border style="width: 100%">
+					<el-table-column label="序号" type="index" align="center" width="50"></el-table-column>
+
+					<el-table-column prop="inspectTime" label="检查时间" align="center" width="200px">
+						<template slot-scope="scope">
+							<el-date-picker
+								v-if="scope.row.isEdit"
+								v-model.trim="scope.row.inspectTime"
+								type="date"
+								class="input-width"
+								value-format="yyyy-MM-dd"
+								placeholder="选择日期"
+							></el-date-picker>
+							<div v-else class="div-content">{{ scope.row.inspectTime }}</div>
+						</template>
+					</el-table-column>
+
+					<el-table-column prop="inspectStaffId" label="检查人员" align="center" width="200px">
+						<template slot-scope="scope">
+							<el-select
+								v-if="scope.row.isEdit"
+								v-model.trim="scope.row.inspectStaffId"
+								placeholder="请选择"
+								class="input-width"
+								@change="handleChangeStaff(scope.row)"
+								clearable
+							>
+								<el-option v-for="subItem in optionStaff" :key="subItem.value" :label="subItem.label" :value="subItem.value"></el-option>
+							</el-select>
+							<div v-else class="div-content">{{ scope.row.inspectStaffName }}</div>
+						</template>
+					</el-table-column>
+
+					<el-table-column prop="inspectStaffMobile" label="联系电话" align="center" width="200px">
+						<template slot-scope="scope">
+							<el-input
+								v-if="scope.row.isEdit"
+								type="number"
+								v-model.trim="scope.row.inspectStaffMobile"
+								placeholder="请输入"
+								class="input-width"
+								clearable
+								disabled
+							></el-input>
+							<div v-else class="div-content">{{ scope.row.inspectStaffMobile }}</div>
+						</template>
+					</el-table-column>
+
+					<el-table-column prop="inspectResult" label="检查结果" align="center" >
+						<template slot-scope="scope">
+							<el-select v-if="scope.row.isEdit" v-model.trim="scope.row.inspectResult" placeholder="请选择" class="input-width" size="small" clearable>
+								<el-option v-for="subItem in optionResult" :key="subItem.value" :label="subItem.label" :value="subItem.value"></el-option>
+							</el-select>
+							<div v-else class="div-content">{{ scope.row.inspectResult == 1 ? '正常' : '异常' }}</div>
+						</template>
+					</el-table-column>
+
+					<!-- <el-table-column
+						prop="detailed"
+						label="隐患明细"
+						align="center"
+						width="200px"
+					>
+						<template slot-scope="scope">
+							<el-input
+								v-if="scope.row.isEdit"
+								type="text"
+								v-model.trim="scope.row.detailed"
+								placeholder="请输入"
+								class="input-width"
+								maxlength="500"
+								clearable
+							></el-input>
+							<div v-else class="div-content">
+								{{ scope.row.detailed }}
+							</div>
+						</template>
+					</el-table-column> -->
+
+					<el-table-column prop="imgList" label="图片列表" align="center" width="150px">
+						<template slot-scope="scope">
+							<div v-if="scope.row.isEdit">
+								<el-upload
+								:disabled="scope.row.imgList.length == 3"
+									:headers="$getElUploadHeaders()"
+									class="avatar-uploader"
+									:action="uploadUrl"
+									:data="{ customerId: customerId }"
+									:show-file-list="true"
+									:limit="3"
+									:file-list="scope.row.imgShowList"
+									:on-success="res => handleImgSuccess(res, scope.row)"
+									:on-remove="res => handleImgRemove(res, scope.row)"
+									list-type="picture"
+									:before-upload="beforeImgUpload"
+								>
+									<div v-if="scope.row.imgList.length != 3"><i class="el-icon-plus avatar-uploader-icon"></i>
+									最多三张图片</div>
+								</el-upload>
+							</div>
+
+							<div v-else class="div-content">
+								<el-image
+									v-if="scope.row.imgList.length > 0"
+									style="width: 100px; height: 50px"
+									:src="scope.row.imgList[0]"
+									fit="cover"
+									:preview-src-list="scope.row.imgList"
+								></el-image>
+							</div>
+						</template>
+					</el-table-column>
+
+					<el-table-column prop="nextInspectTime" label="拟复查时间" align="center" width="200px">
+						<template slot-scope="scope">
+							<el-date-picker
+								v-if="scope.row.isEdit"
+								v-model="scope.row.nextInspectTime"
+								type="date"
+								class="input-width"
+								value-format="yyyy-MM-dd"
+								placeholder="选择日期"
+							></el-date-picker>
+							<div v-else class="div-content">{{ scope.row.nextInspectTime }}</div>
+						</template>
+					</el-table-column>
+
+					<el-table-column v-if="!disabled" fixed="right" label="操作" align="center" width="120">
+						<template slot-scope="scope">
+							<template v-if="scope.row.isEdit">
+								<el-button @click="handleEdit(scope.row)" type="text" size="small" class="btn-color-edit">保存</el-button>
+								<el-button @click="handleChange(scope.row, 'cancle')" type="text" size="small" class="btn-color-edit">取消</el-button>
+							</template>
+							<template v-else>
+								<!-- v-if="formType == 'edit'" -->
+								<el-button  @click="handleChange(scope.row, 'edit')" type="text" size="small" :disabled="disabled" class="btn-color-edit">
+									修改
+								</el-button>
+								<el-popconfirm  title="删除之后无法恢复，确认删除？" @onConfirm="del(scope.row)" @confirm="del(scope.row)">
+									<el-button slot="reference" type="text" size="small" class="btn-color-del" style="margin-left: 10px">删除</el-button>
+								</el-popconfirm>
+							</template>
+						</template>
+					</el-table-column>
+				</el-table>
+			</div>
+		</div>
+	</div>
+</template>
+
+<script>
+import { requestPost, requestGet } from '@/js/dai/request';
+export default {
+	props: {
+		id: {
+			type: String,
+			default: ''
+		},
+		info: {
+			type: Object,
+			default: () => ({})
+		},
+		disabled: {
+			type: Boolean,
+			default: false
+		},
+		formType: {
+			type: String,
+			default: ''
+		},
+		source: {
+			//展示来源：manage  管理平台    visiual  可视化平台
+			type: String,
+			default: 'manage'
+		}
+	},
+	data() {
+		return {
+			uploadUrl: window.SITE_CONFIG['apiURL'] + '/oss/file/uploadqrcodeV2',
+			customerId: localStorage.getItem('customerId'),
+
+			btnDisabled: false,
+			btnType: 'cancle',
+			isEdit: false,
+			tableData: [],
+			tempRow: {},
+
+			optionResult: [
+				{
+					label: '异常',
+					value: '0'
+				},
+				{
+					label: '正常',
+					value: '1'
+				}
+			],
+			optionStaff: [
+				// {
+				//   label: "人名",
+				//   value: "inspectStaffId",
+				// },
+			]
+		};
+	},
+
+	computed: {
+		allowOperate() {
+			const {
+				info: { agencyId }
+			} = this;
+			return agencyId && agencyId == this.$store.state.user.agencyId;
+		}
+	},
+	watch: {
+		id: {
+			handler(val) {
+				console.log('val------points', val);
+				if (val.length > 0) {
+					this.btnDisabled = false;
+					// this.getList();
+				} else this.btnDisabled = true;
+			},
+			immediate: true
+		}
+	},
+
+	created() {
+		console.log('id', this.id);
+		this.getOptionStaff();
+		if (this.id) {
+			this.getList();
+		} else {
+			this.handleAdd();
+		}
+	},
+
+	methods: {
+		beforeImgUpload(file) {
+			console.log(file);
+			const isLt1M = file.size / 1024 / 1024 < 10;
+			const srcType = file.type;
+			const format = file.name.split('.').pop();
+
+			if (!isLt1M) {
+				this.$message.error('上传文件大小不能超过 10MB!');
+				return false;
+			}
+			if (srcType.indexOf('image') == -1) {
+				this.$message.error('仅限图片格式');
+				return false;
+			}
+			return true;
+		},
+
+		handleImgSuccess(res, row) {
+			console.log('handleImgSuccess', res);
+			if (res.code === 0 && res.msg === 'success') {
+				row.imgList.push(res.data.url);
+				this.computeImgShowList(row);
+			} else {
+				this.$message.error(res.msg);
+			}
+		},
+
+		computeImgShowList(row) {
+			row.imgShowList = row.imgList.map(url => {
+				return { name: '', url };
+			});
+		},
+
+		handleImgRemove(file, row) {
+			console.log('handleImgRemove', file);
+			let url = file.url || file.response.data.url;
+			if (url) {
+				row.imgList = row.imgList.filter(item => item !== url);
+				this.computeImgShowList(row);
+			}
+		},
+
+		getRowClass({ rowIndex, columnIndex }) {
+			if (rowIndex === 0) {
+				return 'background: #2195fe; color: #fff;';
+			}
+		},
+
+		handleChange(row, type) {
+			console.log('type----', type);
+			if (type == 'cancle') {
+				row = { ...this.tempRow };
+				row.isEdit = false;
+				if (this.btnType == 'add') this.tableData.pop();
+				this.getList();
+				console.log('row----', row);
+			} else {
+				this.tempRow = { ...row };
+				row.isEdit = true;
+			}
+			this.btnType = type;
+			this.isEdit = !this.isEdit;
+		},
+
+		handleChangeStaff(row) {
+			const { inspectStaffId } = row;
+			const { optionStaff } = this;
+			let item = optionStaff.find(item => item.value == inspectStaffId);
+			if (item) {
+				row.inspectStaffName = item.name;
+				row.inspectStaffMobile = item.mobile;
+			}
+		},
+
+		async getOptionStaff() {
+			let url = `/data/aggregator/org/staff-select-list/${this.$store.state.user.agencyId}`;
+			const { data, code, msg } = await requestPost(url, {});
+
+			if (code === 0) {
+				this.optionStaff = data || [];
+			} else {
+				this.$message.error('请求工作人员数据失败！');
+			}
+		},
+
+		async handleEdit(row) {
+			if (row.result == '0' && row.reviewTime == '') {
+				this.$message.error('拟复查时间不能为空');
+			} else {
+				if (this.id) {
+					console.log('有id');
+					if (this.btnType == 'add') this.save(row);
+					else this.edit(row);
+				} else {
+					this.$message.error('请先保存上方信息');
+				}
+			}
+		},
+
+		handleAdd() {
+			this.btnType = 'add';
+			this.isEdit = true;
+
+			const item = {
+				isEdit: true,
+				// id: this.id,
+				inspectTime: '',
+				inspectStaffId: '',
+				inspectStaffName: '',
+				inspectStaffMobile: '',
+				inspectResult: '',
+				imgList: [],
+				nextInspectTime: ''
+			};
+			this.computeImgShowList(item);
+			if (!this.disabled) {
+				this.tableData.push(item);
+			}
+		},
+
+		async save(row) {
+			console.log(row, this.id);
+			const params = {
+				
+				...row,
+				equipmentId: this.id
+			};
+			const url = `/actual/base/monitoringEquipmentInspectRecord/save`;
+			const { data, code, msg } = await requestPost(url, params);
+			if (code === 0) {
+				this.$message.success('保存成功');
+				row.isEdit = false;
+				this.isEdit = false;
+				this.btnType = 'cancle';
+				this.getList();
+			} else {
+				this.$message.error(msg);
+			}
+		},
+
+		async edit(row) {
+			console.log(row, this.id);
+			const params = {
+				...row
+			};
+			const url = `/actual/base/monitoringEquipmentInspectRecord/update`;
+			const { data, code, msg } = await requestPost(url, params);
+			if (code === 0) {
+				this.$message.success('保存成功');
+				row.isEdit = false;
+				this.isEdit = false;
+				this.getList();
+			} else {
+				this.$message.error(msg);
+			}
+		},
+
+		async del(row) {
+			let arr = [row.id];
+			const url = `/actual/base/monitoringEquipmentInspectRecord/delete`;
+			const { data, code, msg } = await requestPost(url, arr);
+
+			if (code === 0) {
+				this.$message.success('删除成功');
+				this.getList();
+			} else {
+				this.$message.error(msg);
+			}
+		},
+
+		async getList() {
+			const params = {
+				equipmentId: this.id,
+				pageNo: 1,
+				pageSize: 10000
+			};
+			const url = `/actual/base/monitoringEquipmentInspectRecord/page`;
+			const { data, code, msg } = await requestPost(url, params);
+
+			if (code === 0) {
+				this.tableData = data.list.map(item => {
+					this.computeImgShowList(item);
+					return {
+						...item,
+						isEdit: false
+					};
+				});
+				this.handleAdd();
+			} else {
+				this.$message.error(msg);
+			}
+		}
+	}
+};
+</script>
+
+<style lang="scss" scoped>
+@import '@/assets/scss/buttonstyle.scss';
+@import '@/assets/scss/modules/management/list-main.scss';
+
+.mt10 {
+	margin-bottom: 10px;
+}
+.input-width {
+	width: 170px;
+}
 </style>
diff --git a/src/views/modules/shequzhili/welfare/addForm.vue b/src/views/modules/shequzhili/welfare/addForm.vue
index 1355cedc2..241f7090a 100644
--- a/src/views/modules/shequzhili/welfare/addForm.vue
+++ b/src/views/modules/shequzhili/welfare/addForm.vue
@@ -22,7 +22,7 @@
         <el-input
             class="input-width-small"
             placeholder="请输入姓名"
-            v-model="formData.name"
+            v-model.trim="formData.name"
           >
           </el-input>
         </el-form-item>
@@ -34,7 +34,7 @@
           style="display: block"
         >
           <el-select
-            v-model="formData.gender"
+            v-model.trim="formData.gender"
             class="input-width-small"
             placeholder="请选择"
             clearable
@@ -55,7 +55,7 @@
           prop="birthday"
         >
           <el-date-picker
-            v-model="formData.birthday"
+            v-model.trim="formData.birthday"
             class="item_width_2"
             style="width: 220px"
             type="date"
@@ -74,7 +74,7 @@
           style="display: block"
         >
           <el-select
-            v-model="formData.nation"
+            v-model.trim="formData.nation"
             class="input-width-small"
             placeholder="请选择"
             clearable
@@ -97,7 +97,7 @@
         <el-input
             class="input-width-small"
             placeholder="请输入证件号"
-            v-model="formData.idCard"
+            v-model.trim="formData.idCard"
           >
           </el-input>
         </el-form-item>
@@ -110,7 +110,7 @@
         <el-input
             class="input-width-small"
             placeholder="请输入联系电话"
-            v-model="formData.phone"
+            v-model.trim="formData.phone"
           >
           </el-input>
         </el-form-item>
@@ -118,7 +118,7 @@
         <el-form-item label="文化程度" prop="eduLevel">
             <el-select
               class="u-item-width-normal"
-              v-model="formData.eduLevel"
+              v-model.trim="formData.eduLevel"
               placeholder="全部"
               size="small"
               clearable
@@ -140,7 +140,7 @@
           style="display: block"
         >
           <el-select
-            v-model="formData.policyId"
+            v-model.trim="formData.policyId"
             class="input-width-small"
             placeholder="请选择"
             clearable
@@ -173,7 +173,7 @@
           <el-input
             class="item_width_1"
             placeholder="请输入联系人姓名"
-            v-model="formData.principalName"
+            v-model.trim="formData.principalName"
           >
           </el-input>
         </el-form-item>
@@ -187,14 +187,14 @@
           <el-input
             class="item_width_1"
             placeholder="请输入联系人电话"
-            v-model="formData.principalContact"
+            v-model.trim="formData.principalContact"
           >
           </el-input>
         </el-form-item>
 
         <el-form-item label="指派服务" label-width="150px">
           <el-switch
-            v-model="formData.assignSwitch"
+            v-model.trim="formData.assignSwitch"
             @change="handelDisabledRules"
           >
           </el-switch>
@@ -210,7 +210,7 @@
         >
           <input
             type="text"
-            v-model="formData.resiSearchTagId"
+            v-model.trim="formData.resiSearchTagId"
             v-show="false"
           />
           <template v-if="formData.resiSearchTagName">
@@ -232,7 +232,7 @@
           style="display: block"
         >
           <el-select
-            v-model="formData.serviceOrgType"
+            v-model.trim="formData.serviceOrgType"
             class="input-width-small"
             placeholder="请选择"
             clearable
@@ -248,7 +248,7 @@
           </el-select>
           -
           <el-select
-            v-model="formData.serviceOrgId"
+            v-model.trim="formData.serviceOrgId"
             class="input-width-middle"
             filterable
             placeholder="请选择"
@@ -273,7 +273,7 @@
         >
           <el-checkbox
             :label="'是'"
-            v-model="showFeedback"
+            v-model.trim="showFeedback"
             @change="handleChangeFeedback"
           ></el-checkbox>
         </el-form-item>
diff --git a/src/views/modules/shequzhili/welfare/editForm.vue b/src/views/modules/shequzhili/welfare/editForm.vue
index 25f25b830..1955bced5 100644
--- a/src/views/modules/shequzhili/welfare/editForm.vue
+++ b/src/views/modules/shequzhili/welfare/editForm.vue
@@ -16,7 +16,7 @@
         >
           <span>{{ formData.serviceName }}</span>
           <!-- <el-select class="item_width_1"
-                         v-model="formData.serviceProjectId"
+                         v-model.trim="formData.serviceProjectId"
                          placeholder="请选择"
                          filterable
                          clearable>
@@ -36,7 +36,7 @@
         >
           <span>{{ serviceOrgName }}</span>
           <!-- <el-select class="item_width_1"
-                         v-model="formData.serviceOrgId"
+                         v-model.trim="formData.serviceOrgId"
                          placeholder="请选择"
                          filterable
                          clearable>
@@ -59,7 +59,7 @@
           </div>
           <!-- <el-cascader class="item_width_1"
                            ref="myCascader"
-                           v-model="scopeIdArray"
+                           v-model.trim="scopeIdArray"
                            :key="iscascaderShow"
                            :options="casOptions"
                            :props="optionProps"
@@ -75,7 +75,7 @@
         >
           <el-select
             :disabled="formType === 'detail'"
-            v-model="formData.policyId"
+            v-model.trim="formData.policyId"
             class="input-width-small"
             placeholder="请选择"
             clearable
@@ -105,7 +105,7 @@
             :disabled="formType === 'detail'"
             class="item_width_1"
             placeholder="请输入经办人姓名"
-            v-model="formData.principalName"
+            v-model.trim="formData.principalName"
           >
           </el-input>
         </el-form-item>
@@ -119,12 +119,12 @@
             :disabled="formType === 'detail'"
             class="item_width_1"
             placeholder="请输入联系方式"
-            v-model="formData.principalContact"
+            v-model.trim="formData.principalContact"
           >
           </el-input>
         </el-form-item>
         <el-form-item label="指派服务" label-width="150px">
-          <el-switch v-model="assignSwitch"> </el-switch>
+          <el-switch v-model.trim="assignSwitch"> </el-switch>
         </el-form-item>
 
         <el-form-item
@@ -136,7 +136,7 @@
         >
           <input
             type="text"
-            v-model="formData.resiSearchTagId"
+            v-model.trim="formData.resiSearchTagId"
             v-show="false"
           />
           <template v-if="this.resiSearchTagName">
@@ -157,7 +157,7 @@
         >
           <el-date-picker
             :disabled="formType === 'detail'"
-            v-model="formData.serviceTimeStart"
+            v-model.trim="formData.serviceTimeStart"
             :picker-options="startPickerOptions"
             class="item_width_2"
             type="date"
@@ -169,7 +169,7 @@
           <span class="u-data-tag">至</span>
           <el-date-picker
             :disabled="formType === 'detail'"
-            v-model="formData.serviceTimeEnd"
+            v-model.trim="formData.serviceTimeEnd"
             :picker-options="endPickerOptions"
             class="item_width_2 u-data-tag"
             type="date"
@@ -194,7 +194,7 @@
             show-word-limit
             :rows="3"
             placeholder="请输入服务内容，不超过500字"
-            v-model="formData.remark"
+            v-model.trim="formData.remark"
           ></el-input>
         </el-form-item>
       </el-form>
@@ -222,7 +222,7 @@
               show-word-limit
               :rows="3"
               placeholder="请输入服务目标，不超过1000字"
-              v-model="feedbackFormData.serviceGoal"
+              v-model.trim="feedbackFormData.serviceGoal"
             ></el-input>
           </el-form-item>
 
@@ -239,7 +239,7 @@
               show-word-limit
               :rows="3"
               placeholder="请输入服务效果，不超过1000字"
-              v-model="feedbackFormData.serviceEffect"
+              v-model.trim="feedbackFormData.serviceEffect"
             ></el-input>
           </el-form-item>
 
@@ -251,7 +251,7 @@
           >
             <el-input-number
               class="item_width_2"
-              v-model="feedbackFormData.servicePeopleNumber"
+              v-model.trim="feedbackFormData.servicePeopleNumber"
               :min="0"
               :max="9999"
               label="服务人数"
@@ -266,7 +266,7 @@
           >
             <span>已完成</span>
             <!-- <el-select class="item_width_1"
-                           v-model="feedbackFormData.serviceStatus"
+                           v-model.trim="feedbackFormData.serviceStatus"
                            placeholder="全部"
                            clearable>
                   <el-option v-for="item in statusArray"
@@ -285,7 +285,7 @@
           >
             <el-input
               class="item_width_1"
-              v-model="feedbackFormData.address"
+              v-model.trim="feedbackFormData.address"
             ></el-input>
           </el-form-item>
          
diff --git a/src/views/modules/shequzhili/welfare/welfare.vue b/src/views/modules/shequzhili/welfare/welfare.vue
index 22e8e7c12..a56cd0109 100644
--- a/src/views/modules/shequzhili/welfare/welfare.vue
+++ b/src/views/modules/shequzhili/welfare/welfare.vue
@@ -10,7 +10,7 @@
         >
           <el-form-item prop="name" label="姓名">
             <el-input
-              v-model="formData.name"
+              v-model.trim="formData.name"
               class="u-item-width-normal"
               size="small"
               clearable
@@ -21,7 +21,7 @@
 
           <el-form-item label="性别" prop="gender">
             <el-select
-              v-model="formData.gender"
+              v-model.trim="formData.gender"
               class="u-item-width-daterange"
               placeholder="请选择"
               size="small"
@@ -39,7 +39,7 @@
 
           <el-form-item label="年龄" prop="age">
             <el-input
-              v-model="formData.age"
+              v-model.trim="formData.age"
               class="u-item-width-normal"
               size="small"
               clearable
@@ -50,7 +50,7 @@
 
           <el-form-item label="证件号" prop="idCard">
             <el-input
-              v-model="formData.idCard"
+              v-model.trim="formData.idCard"
               class="u-item-width-normal"
               size="small"
               clearable
@@ -62,7 +62,7 @@
           <el-form-item label="文化程度" prop="eduLevel">
             <el-select
               class="u-item-width-normal"
-              v-model="formData.eduLevel"
+              v-model.trim="formData.eduLevel"
               placeholder="全部"
               size="small"
               clearable
@@ -81,7 +81,7 @@
             <el-select
               class="u-item-width-normal"
               placeholder="全部"
-              v-model="formData.jobPost"
+              v-model.trim="formData.jobPost"
               size="small"
               clearable
               multiple 
@@ -97,7 +97,7 @@
           </el-form-item>
 
           <el-form-item label="入职时间" prop="hiredateEnd">
-            <el-date-picker v-model="formData.hiredateStr"
+            <el-date-picker v-model.trim="formData.hiredateStr"
                                 :picker-options="startPickerOptions"
                                 class="u-item-width-daterange"
                                 size="small"
@@ -107,7 +107,7 @@
                                 placeholder="开始时间">
                 </el-date-picker>
                 <span class="u-data-tag">至</span>
-                <el-date-picker v-model="formData.hiredateEnd"
+                <el-date-picker v-model.trim="formData.hiredateEnd"
                                 :picker-options="endPickerOptions"
                                 class="u-item-width-daterange u-data-tag"
                                 size="small"
diff --git a/src/views/modules/shequzhili/xiangmu/cpts/demand-info.vue b/src/views/modules/shequzhili/xiangmu/cpts/demand-info.vue
index 54f83431c..1163823a4 100644
--- a/src/views/modules/shequzhili/xiangmu/cpts/demand-info.vue
+++ b/src/views/modules/shequzhili/xiangmu/cpts/demand-info.vue
@@ -90,7 +90,7 @@
                      label-width="100px">
               <el-form-item label="处理方式："
                             prop="operateType">
-                <el-radio-group v-model="fmData.operateType">
+                <el-radio-group v-model.trim="fmData.operateType">
                   <el-radio label="dispose">指派</el-radio>
                   <el-radio label="close">完成情况</el-radio>
                 </el-radio-group>
@@ -129,7 +129,7 @@
                 <el-input type="textarea"
                           :rows="2"
                           placeholder="您输入的结案说明会向居民公开展示"
-                          v-model="fmData.publicReply">
+                          v-model.trim="fmData.publicReply">
                 </el-input>
               </el-form-item>
             </el-form>
diff --git a/src/views/modules/shequzhili/xiangmu/cpts/edit.vue b/src/views/modules/shequzhili/xiangmu/cpts/edit.vue
index e4af7f2c6..3966c0971 100644
--- a/src/views/modules/shequzhili/xiangmu/cpts/edit.vue
+++ b/src/views/modules/shequzhili/xiangmu/cpts/edit.vue
@@ -131,19 +131,19 @@
             style="width: 200px; margin-right: 20px"
             placeholder="请输入姓名	"
             :disabled="formType === 'edit'"
-            v-model="fmData.name"
+            v-model.trim="fmData.name"
           >
           </el-input>
 
           <el-checkbox
-            v-model="fmData.isWelfare"
+            v-model.trim="fmData.isWelfare"
             :disabled="formType === 'edit'"
             true-label="1"
             false-label="0"
             >享受福利</el-checkbox
           >
           <el-checkbox
-            v-model="fmData.isCheck"
+            v-model.trim="fmData.isCheck"
             true-label="1"
             false-label="0"
             :disabled="formType === 'edit'"
@@ -163,7 +163,7 @@
             maxlength="30"
             show-word-limit
             placeholder="请输入联系电话	"
-            v-model="fmData.mobile"
+            v-model.trim="fmData.mobile"
             :disabled="formType === 'edit'"
           >
           </el-input>
@@ -179,7 +179,7 @@
             class="item_width_1"
             maxlength="30"
             placeholder="请输入证件号或证件号"
-            v-model="fmData.idCard"
+            v-model.trim="fmData.idCard"
             @blur="handleBlurId"
             :disabled="formType === 'edit'"
           ></el-input>
@@ -217,7 +217,7 @@
           style="display: block"
         >
           <el-date-picker
-            v-model="fmData.birthday"
+            v-model.trim="fmData.birthday"
             type="date"
             placeholder="出生日期"
             value-format="yyyy-MM-dd"
@@ -237,7 +237,7 @@
             maxlength="50"
             show-word-limit
             placeholder="请输入出生地"
-            v-model="fmData.birthplace"
+            v-model.trim="fmData.birthplace"
           >
           </el-input>
         </el-form-item>
@@ -253,7 +253,7 @@
             maxlength="30"
             show-word-limit
             placeholder="请输入出生人父亲姓名"
-            v-model="fmData.father"
+            v-model.trim="fmData.father"
           >
           </el-input>
         </el-form-item>
@@ -269,7 +269,7 @@
             maxlength="30"
             show-word-limit
             placeholder="请输入出生人母亲姓名"
-            v-model="fmData.mother"
+            v-model.trim="fmData.mother"
           >
           </el-input>
         </el-form-item>
@@ -281,7 +281,7 @@
           style="display: block"
         >
           <el-input-number
-            v-model="fmData.count"
+            v-model.trim="fmData.count"
             :min="1"
             :max="50"
             label="请输入胎次"
@@ -295,7 +295,7 @@
           style="display: block"
         >
           <el-date-picker
-            v-model="fmData.reportDate"
+            v-model.trim="fmData.reportDate"
             placeholder="申报户口日期"
             value-format="yyyy-MM-dd"
           >
@@ -314,7 +314,7 @@
             show-word-limit
             placeholder="请输入户主姓名"
             :disabled="fmData.alreadyHaveMaster"
-            v-model="fmData.householderName"
+            v-model.trim="fmData.householderName"
           >
           </el-input>
         </el-form-item>
@@ -357,7 +357,7 @@
             show-word-limit
             :rows="3"
             placeholder="请输入备注，不超过500字"
-            v-model="fmData.remark"
+            v-model.trim="fmData.remark"
           ></el-input>
         </el-form-item>
       </el-form>
diff --git a/src/views/modules/shequzhili/xiangmu/cpts/project-info.vue b/src/views/modules/shequzhili/xiangmu/cpts/project-info.vue
index 46b72a69e..7d872190d 100644
--- a/src/views/modules/shequzhili/xiangmu/cpts/project-info.vue
+++ b/src/views/modules/shequzhili/xiangmu/cpts/project-info.vue
@@ -141,12 +141,12 @@
                 placement="bottom"
                 width="400"
                 height="400"
-                v-model="visibleCatePanel"
+                v-model.trim="visibleCatePanel"
               >
                 <div class="f" style="min-height: 120px">
                   <h2>更改分类</h2>
                   <el-cascader
-                    v-model="selectedCateData"
+                    v-model.trim="selectedCateData"
                     :options="cateOptions"
                     :props="{
                       multiple: true,
@@ -196,12 +196,12 @@
                 placement="bottom"
                 width="450"
                 height="400"
-                v-model="visibleTagPanel"
+                v-model.trim="visibleTagPanel"
               >
                 <div class="f" style="min-height: 120px">
                   <h2>更改标签</h2>
                   <el-select
-                    v-model="selectedTagData"
+                    v-model.trim="selectedTagData"
                     multiple
                     allow-create
                     filterable
@@ -293,7 +293,7 @@
                     :class="{ 'form-item': source === 'visiual' }"
                     prop="operateType"
                   >
-                    <el-radio-group v-model="fmData.operateType">
+                    <el-radio-group v-model.trim="fmData.operateType">
                       <el-radio label="dispose">处理/响应</el-radio>
                       <el-radio label="close">结案</el-radio>
                       <el-radio label="turn">转其他机关/科室</el-radio>
@@ -334,7 +334,7 @@
                       placement="bottom"
                       width="400"
                       height="400"
-                      v-model="visibleStaffPanel"
+                      v-model.trim="visibleStaffPanel"
                     >
                       <div class="f">
                         <select-staff
@@ -423,7 +423,7 @@
                       type="textarea"
                       :rows="2"
                       placeholder="您输入的结案说明会向居民公开展示"
-                      v-model="fmData.publicReply"
+                      v-model.trim="fmData.publicReply"
                     >
                     </el-input>
                   </el-form-item>
@@ -437,7 +437,7 @@
                       type="textarea"
                       :rows="2"
                       placeholder="请输入内容"
-                      v-model="fmData.internalRemark"
+                      v-model.trim="fmData.internalRemark"
                     >
                     </el-input>
                   </el-form-item>
@@ -471,7 +471,7 @@
                       type="textarea"
                       :rows="2"
                       placeholder="请输入内容"
-                      v-model="fmData.publicReply"
+                      v-model.trim="fmData.publicReply"
                     >
                     </el-input>
                   </el-form-item>
@@ -488,7 +488,7 @@
                       type="textarea"
                       :rows="2"
                       placeholder="请输入内容"
-                      v-model="fmData.publicReply"
+                      v-model.trim="fmData.publicReply"
                     >
                     </el-input>
                   </el-form-item>
diff --git a/src/views/modules/shequzhili/xiangmu/index.vue b/src/views/modules/shequzhili/xiangmu/index.vue
index 9bbd6aa06..0b532f814 100644
--- a/src/views/modules/shequzhili/xiangmu/index.vue
+++ b/src/views/modules/shequzhili/xiangmu/index.vue
@@ -11,7 +11,7 @@
         >
           <el-form-item label="项目标题" prop="title">
             <el-input
-              v-model="fmData.title"
+              v-model.trim="fmData.title"
               class="u-item-width-normal"
               size="small"
               clearable
@@ -21,7 +21,7 @@
           </el-form-item>
           <el-form-item label="转项目时间" prop="startDate">
               <el-date-picker
-                v-model="fmData.startDate"
+                v-model.trim="fmData.startDate"
                 :picker-options="startPickerOptions"
                 class="u-item-width-daterange"
                 size="small"
@@ -33,7 +33,7 @@
               </el-date-picker>
               <span class="u-data-tag">至</span>
               <el-date-picker
-                v-model="fmData.endDate"
+                v-model.trim="fmData.endDate"
                 :picker-options="endPickerOptions"
                 class="u-item-width-daterange u-data-tag"
                 size="small"
diff --git a/src/views/modules/shequzhili/xiangmu/xiangmu-ling.vue b/src/views/modules/shequzhili/xiangmu/xiangmu-ling.vue
index 015bdee07..3e3739b9c 100644
--- a/src/views/modules/shequzhili/xiangmu/xiangmu-ling.vue
+++ b/src/views/modules/shequzhili/xiangmu/xiangmu-ling.vue
@@ -15,7 +15,7 @@
                           label-width="100px"
                           prop="orgId">
               <el-cascader ref="cascaderUnit"
-                           v-model="orgId"
+                           v-model.trim="orgId"
                            :options="optionsA"
                            :props="{ checkStrictly: true,
                 emitPath: false,children:'subAgencyList',label:'agencyName', value: 'orgLevel'}"
@@ -24,7 +24,7 @@
             </el-form-item>
             <el-form-item label="上报渠道"
                           prop="origin">
-              <el-select v-model="fmData.origin"
+              <el-select v-model.trim="fmData.origin"
                          placeholder="请选择"
                          size="small"
                          clearable
@@ -38,7 +38,7 @@
             </el-form-item>
             <el-form-item label="上报人"
                           prop="staffName">
-              <el-input v-model="fmData.staffName"
+              <el-input v-model.trim="fmData.staffName"
                         class="item_width_2"
                         size="small"
                         clearable
@@ -47,7 +47,7 @@
             </el-form-item>
             <el-form-item label="联系电话"
                           prop="mobile">
-              <el-input v-model="fmData.mobile"
+              <el-input v-model.trim="fmData.mobile"
                         class="item_width_2"
                         size="small"
                         clearable
@@ -56,7 +56,7 @@
             </el-form-item>
             <el-form-item label="事件内容"
                           prop="backGround">
-              <el-input v-model="fmData.backGround"
+              <el-input v-model.trim="fmData.backGround"
                         class="item_width_2"
                         size="small"
                         clearable
@@ -66,7 +66,7 @@
             <el-form-item label="事件类型"
                           prop="firstIdList">
               <el-cascader ref="cascaderEvent"
-                           v-model="eventTypeCheck"
+                           v-model.trim="eventTypeCheck"
                            :options="cateOptions"
                            collapse-tags
                            :show-all-levels="false"
@@ -92,7 +92,7 @@
             <el-form-item label="事件状态"
                           prop="status">
               <el-select class="item_width_2"
-                         v-model="fmData.status"
+                         v-model.trim="fmData.status"
                          placeholder="全部"
                          size="small"
                          clearable>
@@ -107,7 +107,7 @@
             <el-form-item label="解决状态"
                           prop="status">
               <el-select class="item_width_2"
-                         v-model="fmData.closedStatus"
+                         v-model.trim="fmData.closedStatus"
                          placeholder="全部"
                          size="small"
                          clearable>
@@ -121,7 +121,7 @@
             </el-form-item>
             <el-form-item label="上报时间"
                           prop="startTime">
-              <el-date-picker v-model="fmData.startTime"
+              <el-date-picker v-model.trim="fmData.startTime"
                               :picker-options="startPickerOptions"
                               class="item_width_2"
                               size="small"
@@ -130,7 +130,7 @@
                               placeholder="开始时间">
               </el-date-picker>
               <span class="u-data-tag">至</span>
-              <el-date-picker v-model="fmData.endTime"
+              <el-date-picker v-model.trim="fmData.endTime"
                               :picker-options="endPickerOptions"
                               class="item_width_2 u-data-tag"
                               size="small"
@@ -142,7 +142,7 @@
 
             <el-form-item label="处置选项"
                           prop="staffId">
-              <el-checkbox v-model="checkStaffId"
+              <el-checkbox v-model.trim="checkStaffId"
                            @change="handleCheckbox"></el-checkbox>
 
             </el-form-item>
diff --git a/src/views/modules/sys/calender-add-or-update.vue b/src/views/modules/sys/calender-add-or-update.vue
index 2887b2625..2823dba93 100644
--- a/src/views/modules/sys/calender-add-or-update.vue
+++ b/src/views/modules/sys/calender-add-or-update.vue
@@ -2,17 +2,17 @@
   <el-dialog :visible.sync="visible" :title="!dataForm.id ? $t('add') : $t('update')" :close-on-click-modal="false" :close-on-press-escape="false">
     <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" :label-width="$i18n.locale === 'en-US' ? '120px' : '80px'">
       <el-form-item label="日期:" prop="queryDate">
-          <!-- <el-input v-model="dataForm.queryDate" placeholder="选择日期"></el-input> -->
+          <!-- <el-input v-model.trim="dataForm.queryDate" placeholder="选择日期"></el-input> -->
           <el-date-picker
-            v-model="dataForm.queryDate"
+            v-model.trim="dataForm.queryDate"
             type="date"
             value-format="yyyy-MM-dd"
             placeholder="选择日期">
           </el-date-picker>
       </el-form-item>
       <el-form-item label="星期:" prop="weekday">
-          <!-- <el-input v-model="dataForm.weekday" placeholder="选择星期"></el-input> -->
-          <el-select v-model="dataForm.weekday" placeholder="请选择">
+          <!-- <el-input v-model.trim="dataForm.weekday" placeholder="选择星期"></el-input> -->
+          <el-select v-model.trim="dataForm.weekday" placeholder="请选择">
             <el-option
               v-for="item in weekDayOptions"
               :key="item.value"
@@ -22,8 +22,8 @@
          </el-select>
       </el-form-item>
       <el-form-item label="工作" prop="type">
-          <!-- <el-input v-model="dataForm.type" placeholder="1为工作日，2为周末，3为节假日"></el-input> -->
-          <el-select v-model="dataForm.type" placeholder="请选择">
+          <!-- <el-input v-model.trim="dataForm.type" placeholder="1为工作日，2为周末，3为节假日"></el-input> -->
+          <el-select v-model.trim="dataForm.type" placeholder="请选择">
             <el-option
               v-for="item in typeOptions"
               :key="item.value"
@@ -33,16 +33,16 @@
          </el-select>
       </el-form-item>
       <el-form-item label="节日名称" prop="holiday">
-          <el-input v-model="dataForm.holiday" placeholder="节日名称，工作日时显示“无”，周末时显示“周末”，节日时显示节日名称"></el-input>
+          <el-input v-model.trim="dataForm.holiday" placeholder="节日名称，工作日时显示“无”，周末时显示“周末”，节日时显示节日名称"></el-input>
       </el-form-item>
       <el-form-item label="节日备注" prop="holidayRemark">
-          <el-input v-model="dataForm.holidayRemark" placeholder="节日备注"></el-input>
+          <el-input v-model.trim="dataForm.holidayRemark" placeholder="节日备注"></el-input>
       </el-form-item>
       <el-form-item label="假期开始" prop="begin">
-          <el-input v-model="dataForm.begin" placeholder="节日或周末开始时间，如果是工作日，此字段为空串yyyyMMdd"></el-input>
+          <el-input v-model.trim="dataForm.begin" placeholder="节日或周末开始时间，如果是工作日，此字段为空串yyyyMMdd"></el-input>
       </el-form-item>
       <el-form-item label="假期结束" prop="end">
-          <el-input v-model="dataForm.end" placeholder="节日或周末结束时间，如果是工作日，此字段为空串yyyyMMdd"></el-input>
+          <el-input v-model.trim="dataForm.end" placeholder="节日或周末结束时间，如果是工作日，此字段为空串yyyyMMdd"></el-input>
       </el-form-item>
       </el-form>
     <template slot="footer">
diff --git a/src/views/modules/sys/calender.vue b/src/views/modules/sys/calender.vue
index 9fc1b3d9a..c245b9097 100644
--- a/src/views/modules/sys/calender.vue
+++ b/src/views/modules/sys/calender.vue
@@ -3,7 +3,7 @@
     <div class="mod-__calender}">
       <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
         <el-form-item label="日期">
-          <el-input v-model="dataForm.day" placeholder="yyyyMMdd可模糊查询" clearable></el-input>
+          <el-input v-model.trim="dataForm.day" placeholder="yyyyMMdd可模糊查询" clearable></el-input>
         </el-form-item>
         <el-form-item>
           <el-button @click="getDataList()">{{ $t('query') }}</el-button>
diff --git a/src/views/modules/sys/dept-add-or-update.vue b/src/views/modules/sys/dept-add-or-update.vue
index 33c0de850..fabbc4310 100644
--- a/src/views/modules/sys/dept-add-or-update.vue
+++ b/src/views/modules/sys/dept-add-or-update.vue
@@ -2,10 +2,10 @@
   <el-dialog :visible.sync="visible" :title="!dataForm.id ? $t('add') : $t('update')" :close-on-click-modal="false" :close-on-press-escape="false">
     <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" label-width="120px">
       <el-form-item prop="name" :label="$t('dept.name')">
-        <el-input v-model="dataForm.name" :placeholder="$t('dept.name')"></el-input>
+        <el-input v-model.trim="dataForm.name" :placeholder="$t('dept.name')"></el-input>
       </el-form-item>
       <el-form-item prop="parentName" :label="$t('dept.parentName')" class="dept-list">
-        <el-popover v-model="deptListVisible" ref="deptListPopover" placement="bottom-start" trigger="click">
+        <el-popover v-model.trim="deptListVisible" ref="deptListPopover" placement="bottom-start" trigger="click">
           <el-tree
             :data="deptList"
             :props="{ label: 'name', children: 'children' }"
@@ -17,7 +17,7 @@
             @current-change="deptListTreeCurrentChangeHandle">
           </el-tree>
         </el-popover>
-        <el-input v-model="dataForm.parentName" v-popover:deptListPopover :readonly="true" :placeholder="$t('dept.parentName')">
+        <el-input v-model.trim="dataForm.parentName" v-popover:deptListPopover :readonly="true" :placeholder="$t('dept.parentName')">
           <i
             v-if="$store.state.user.superAdmin === 1 && dataForm.pid !== '0'"
             slot="suffix"
@@ -27,7 +27,7 @@
         </el-input>
       </el-form-item>
       <el-form-item prop="sort" :label="$t('dept.sort')">
-        <el-input-number v-model="dataForm.sort" controls-position="right" :min="0" :label="$t('dept.sort')"></el-input-number>
+        <el-input-number v-model.trim="dataForm.sort" controls-position="right" :min="0" :label="$t('dept.sort')"></el-input-number>
       </el-form-item>
     </el-form>
     <template slot="footer">
diff --git a/src/views/modules/sys/dict-data-add-or-update.vue b/src/views/modules/sys/dict-data-add-or-update.vue
index 96a3f348d..d4258f8d6 100644
--- a/src/views/modules/sys/dict-data-add-or-update.vue
+++ b/src/views/modules/sys/dict-data-add-or-update.vue
@@ -2,16 +2,16 @@
   <el-dialog :visible.sync="visible" :title="!dataForm.id ? $t('add') : $t('update')" :close-on-click-modal="false" :close-on-press-escape="false">
     <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" label-width="120px">
       <el-form-item prop="dictValue" :label="$t('dict.dictValue')">
-        <el-input v-model="dataForm.dictValue" :placeholder="$t('dict.dictValue')"></el-input>
+        <el-input v-model.trim="dataForm.dictValue" :placeholder="$t('dict.dictValue')"></el-input>
       </el-form-item>
       <el-form-item prop="dictLabel" :label="$t('dict.dictLabel')">
-        <el-input v-model="dataForm.dictLabel" :placeholder="$t('dict.dictLabel')"></el-input>
+        <el-input v-model.trim="dataForm.dictLabel" :placeholder="$t('dict.dictLabel')"></el-input>
       </el-form-item>
       <el-form-item prop="sort" :label="$t('dict.sort')">
-        <el-input-number v-model="dataForm.sort" controls-position="right" :min="0" :label="$t('dict.sort')"></el-input-number>
+        <el-input-number v-model.trim="dataForm.sort" controls-position="right" :min="0" :label="$t('dict.sort')"></el-input-number>
       </el-form-item>
       <el-form-item prop="remark" :label="$t('dict.remark')">
-        <el-input v-model="dataForm.remark" :placeholder="$t('dict.remark')"></el-input>
+        <el-input v-model.trim="dataForm.remark" :placeholder="$t('dict.remark')"></el-input>
       </el-form-item>
     </el-form>
     <template slot="footer">
diff --git a/src/views/modules/sys/dict-data.vue b/src/views/modules/sys/dict-data.vue
index f6024215f..d6b144882 100644
--- a/src/views/modules/sys/dict-data.vue
+++ b/src/views/modules/sys/dict-data.vue
@@ -6,12 +6,12 @@
                :model="dataForm"
                @keyup.enter.native="getDataList()">
         <el-form-item>
-          <el-input v-model="dataForm.dictValue"
+          <el-input v-model.trim="dataForm.dictValue"
                     :placeholder="$t('dict.dictValue')"
                     clearable></el-input>
         </el-form-item>
         <el-form-item>
-          <el-input v-model="dataForm.dictLabel"
+          <el-input v-model.trim="dataForm.dictLabel"
                     :placeholder="$t('dict.dictLabel')"
                     clearable></el-input>
         </el-form-item>
diff --git a/src/views/modules/sys/dict-type-add-or-update.vue b/src/views/modules/sys/dict-type-add-or-update.vue
index 8ef034bd3..c97bb78ab 100644
--- a/src/views/modules/sys/dict-type-add-or-update.vue
+++ b/src/views/modules/sys/dict-type-add-or-update.vue
@@ -2,16 +2,16 @@
   <el-dialog :visible.sync="visible" :title="!dataForm.id ? $t('add') : $t('update')" :close-on-click-modal="false" :close-on-press-escape="false">
     <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" label-width="120px">
       <el-form-item prop="dictName" :label="$t('dict.dictName')">
-        <el-input v-model="dataForm.dictName" :placeholder="$t('dict.dictName')"></el-input>
+        <el-input v-model.trim="dataForm.dictName" :placeholder="$t('dict.dictName')"></el-input>
       </el-form-item>
       <el-form-item prop="dictType" :label="$t('dict.dictType')">
-        <el-input v-model="dataForm.dictType" :placeholder="$t('dict.dictType')"></el-input>
+        <el-input v-model.trim="dataForm.dictType" :placeholder="$t('dict.dictType')"></el-input>
       </el-form-item>
       <el-form-item prop="sort" :label="$t('dict.sort')">
-        <el-input-number v-model="dataForm.sort" controls-position="right" :min="0" :label="$t('dict.sort')"></el-input-number>
+        <el-input-number v-model.trim="dataForm.sort" controls-position="right" :min="0" :label="$t('dict.sort')"></el-input-number>
       </el-form-item>
       <el-form-item prop="remark" :label="$t('dict.remark')">
-        <el-input v-model="dataForm.remark" :placeholder="$t('dict.remark')"></el-input>
+        <el-input v-model.trim="dataForm.remark" :placeholder="$t('dict.remark')"></el-input>
       </el-form-item>
     </el-form>
     <template slot="footer">
diff --git a/src/views/modules/sys/dict-type.vue b/src/views/modules/sys/dict-type.vue
index 5f5c945d9..ed2c2bbfe 100644
--- a/src/views/modules/sys/dict-type.vue
+++ b/src/views/modules/sys/dict-type.vue
@@ -6,12 +6,12 @@
                :model="dataForm"
                @keyup.enter.native="getDataList()">
         <el-form-item>
-          <el-input v-model="dataForm.dictName"
+          <el-input v-model.trim="dataForm.dictName"
                     :placeholder="$t('dict.dictName')"
                     clearable></el-input>
         </el-form-item>
         <el-form-item>
-          <el-input v-model="dataForm.dictType"
+          <el-input v-model.trim="dataForm.dictType"
                     :placeholder="$t('dict.dictType')"
                     clearable></el-input>
         </el-form-item>
diff --git a/src/views/modules/sys/icvaccineprarmeter-add-or-update.vue b/src/views/modules/sys/icvaccineprarmeter-add-or-update.vue
index 9a5619d1d..b44978594 100644
--- a/src/views/modules/sys/icvaccineprarmeter-add-or-update.vue
+++ b/src/views/modules/sys/icvaccineprarmeter-add-or-update.vue
@@ -22,16 +22,16 @@
         </el-select>
       </el-form-item>
         <el-form-item v-if="dataForm.homeId === null" label="小区" label-width="150px" prop="villageName">
-            <el-input class="item_width_2" style="width: 200px; margin-right: 20px" clearable v-model="dataForm.villageName"  placeholder="小区"></el-input>
+            <el-input class="item_width_2" style="width: 200px; margin-right: 20px" clearable v-model.trim="dataForm.villageName"  placeholder="小区"></el-input>
         </el-form-item>
         <el-form-item v-if="dataForm.homeId === null" label="楼号" label-width="150px" prop="buildName">
-            <el-input class="item_width_2" style="width: 200px; margin-right: 20px" clearable v-model="dataForm.buildName"  placeholder="楼号"></el-input>
+            <el-input class="item_width_2" style="width: 200px; margin-right: 20px" clearable v-model.trim="dataForm.buildName"  placeholder="楼号"></el-input>
         </el-form-item>
         <el-form-item v-if="dataForm.homeId === null" label="单元号" label-width="150px" prop="unitName">
-            <el-input class="item_width_2" style="width: 200px; margin-right: 20px" clearable v-model="dataForm.unitName"  placeholder="单元号"></el-input>
+            <el-input class="item_width_2" style="width: 200px; margin-right: 20px" clearable v-model.trim="dataForm.unitName"  placeholder="单元号"></el-input>
         </el-form-item>
         <el-form-item v-if="dataForm.homeId === null" label="房号" label-width="150px" prop="homeName">
-            <el-input class="item_width_2" style="width: 200px; margin-right: 20px" clearable v-model="dataForm.homeName"  placeholder="房号"></el-input>
+            <el-input class="item_width_2" style="width: 200px; margin-right: 20px" clearable v-model.trim="dataForm.homeName"  placeholder="房号"></el-input>
         </el-form-item>
       <el-form-item v-if="dataForm.homeId !== null" label="所属房屋" label-width="150px" prop="homeId">
               <el-select
@@ -124,13 +124,13 @@
           </el-select>
       </el-form-item>
       <el-form-item label="姓名" label-width="150px" prop="name">
-          <el-input class="item_width_2" style="width: 200px; margin-right: 20px" clearable v-model="dataForm.name"  placeholder="姓名"></el-input>
+          <el-input class="item_width_2" style="width: 200px; margin-right: 20px" clearable v-model.trim="dataForm.name"  placeholder="姓名"></el-input>
       </el-form-item>
       <el-form-item label="联系电话" label-width="150px" prop="mobile">
-          <el-input v-model="dataForm.mobile" class="item_width_2" clearable style="width: 200px; margin-right: 20px"  placeholder="联系电话"></el-input>
+          <el-input v-model.trim="dataForm.mobile" class="item_width_2" clearable style="width: 200px; margin-right: 20px"  placeholder="联系电话"></el-input>
       </el-form-item>
       <el-form-item label="证件号" label-width="150px" prop="idCard">
-          <el-input v-model="dataForm.idCard" class="item_width_2" clearable style="width: 200px; margin-right: 20px" placeholder="证件号"></el-input>
+          <el-input v-model.trim="dataForm.idCard" class="item_width_2" clearable style="width: 200px; margin-right: 20px" placeholder="证件号"></el-input>
       </el-form-item>
       <el-form-item label="是否接种" label-width="150px" prop="isVaccination">
           <el-select class="item_width_2"
@@ -147,7 +147,7 @@
       </el-form-item>
       <el-form-item v-if="dataForm.isVaccination === '1'" label="第一次接种时间" label-width="150px" >
         <el-date-picker
-            v-model="dataForm.firstVacTime"
+            v-model.trim="dataForm.firstVacTime"
             type="date"
             clearable
             placeholder="选择日期时间"
@@ -172,7 +172,7 @@
       </el-form-item>
       <el-form-item v-if="dataForm.isVaccination === '1'" label="第二次接种时间" label-width="150px">
         <el-date-picker
-            v-model="dataForm.secondVacTime"
+            v-model.trim="dataForm.secondVacTime"
             type="date"
             clearable
             placeholder="选择日期时间"
@@ -197,7 +197,7 @@
       </el-form-item>
       <el-form-item v-if="dataForm.isVaccination === '1'" label="第三次接种时间" label-width="150px">
         <el-date-picker
-            v-model="dataForm.thirdVacTime"
+            v-model.trim="dataForm.thirdVacTime"
             type="date"
             clearable
             placeholder="选择日期时间"
@@ -242,7 +242,7 @@
             show-word-limit
             :rows="3"
             placeholder="请输入备注，不超过500字"
-            v-model="dataForm.note"
+            v-model.trim="dataForm.note"
         ></el-input>
       </el-form-item>
     </el-form>
diff --git a/src/views/modules/sys/icvaccineprarmeter-check.vue b/src/views/modules/sys/icvaccineprarmeter-check.vue
index 021c67466..0846a951a 100644
--- a/src/views/modules/sys/icvaccineprarmeter-check.vue
+++ b/src/views/modules/sys/icvaccineprarmeter-check.vue
@@ -14,7 +14,7 @@
                       style="display: block">
           <el-input class="item_width_1"
                     placeholder="请输入"
-                    v-model="dataForm.gridName"
+                    v-model.trim="dataForm.gridName"
                     disabled>
           </el-input>
         </el-form-item>
@@ -25,7 +25,7 @@
                       style="display: block">
           <el-input class="item_width_1"
                     placeholder="请输入"
-                    v-model="dataForm.villageName"
+                    v-model.trim="dataForm.villageName"
                     disabled>
           </el-input>
         </el-form-item>
@@ -36,7 +36,7 @@
                       style="display: block">
           <el-input class="item_width_1"
                     placeholder="请输入"
-                    v-model="dataForm.buildName"
+                    v-model.trim="dataForm.buildName"
                     disabled>
           </el-input>
         </el-form-item>
@@ -47,7 +47,7 @@
                       style="display: block">
           <el-input class="item_width_1"
                     placeholder="请输入"
-                    v-model="dataForm.unitName"
+                    v-model.trim="dataForm.unitName"
                     disabled>
           </el-input>
         </el-form-item>
@@ -58,7 +58,7 @@
                       style="display: block">
           <el-input class="item_width_1"
                     placeholder="请输入"
-                    v-model="dataForm.homeName"
+                    v-model.trim="dataForm.homeName"
                     disabled>
           </el-input>
         </el-form-item>
@@ -86,7 +86,7 @@
                       style="display: block">
           <el-input class="item_width_1"
                     placeholder="请输入"
-                    v-model="dataForm.name"
+                    v-model.trim="dataForm.name"
                     disabled>
           </el-input>
         </el-form-item>
@@ -97,7 +97,7 @@
                       style="display: block">
           <el-input class="item_width_1"
                     placeholder="请输入"
-                    v-model="dataForm.mobile"
+                    v-model.trim="dataForm.mobile"
                     disabled>
           </el-input>
         </el-form-item>
@@ -108,7 +108,7 @@
                       style="display: block">
           <el-input class="item_width_1"
                     placeholder="请输入"
-                    v-model="dataForm.idCard"
+                    v-model.trim="dataForm.idCard"
                     disabled>
           </el-input>
         </el-form-item>
@@ -138,7 +138,7 @@
                       style="display: block">
           <el-input class="item_width_1"
                     placeholder="请输入"
-                    v-model="dataForm.firstVacTime"
+                    v-model.trim="dataForm.firstVacTime"
                     disabled>
           </el-input>
         </el-form-item>
@@ -149,7 +149,7 @@
                       style="display: block">
           <el-input class="item_width_1"
                     placeholder="请输入"
-                    v-model="dataForm.firstVacSite"
+                    v-model.trim="dataForm.firstVacSite"
                     disabled>
           </el-input>
         </el-form-item>
@@ -160,7 +160,7 @@
                       style="display: block">
           <el-input class="item_width_1"
                     placeholder="请输入"
-                    v-model="dataForm.secondVacTime"
+                    v-model.trim="dataForm.secondVacTime"
                     disabled>
           </el-input>
         </el-form-item>
@@ -171,7 +171,7 @@
                       style="display: block">
           <el-input class="item_width_1"
                     placeholder="请输入"
-                    v-model="dataForm.secondVacSite"
+                    v-model.trim="dataForm.secondVacSite"
                     disabled>
           </el-input>
         </el-form-item>
@@ -182,7 +182,7 @@
                       style="display: block">
           <el-input class="item_width_1"
                     placeholder="请输入"
-                    v-model="dataForm.thirdVacTime"
+                    v-model.trim="dataForm.thirdVacTime"
                     disabled>
           </el-input>
         </el-form-item>
@@ -194,7 +194,7 @@
                       style="display: block">
           <el-input class="item_width_1"
                     placeholder="请输入"
-                    v-model="dataForm.thirdVacSite"
+                    v-model.trim="dataForm.thirdVacSite"
                     disabled>
           </el-input>
         </el-form-item>
@@ -205,7 +205,7 @@
                       style="display: block">
           <el-input class="item_width_1"
                     placeholder="请输入"
-                    v-model="dataForm.reason"
+                    v-model.trim="dataForm.reason"
                     disabled>
           </el-input>
         </el-form-item>
@@ -216,7 +216,7 @@
                       style="display: block">
           <el-input class="item_width_1"
                     placeholder="请输入"
-                    v-model="dataForm.note"
+                    v-model.trim="dataForm.note"
                     disabled>
           </el-input>
         </el-form-item>
diff --git a/src/views/modules/sys/icvaccineprarmeter.vue b/src/views/modules/sys/icvaccineprarmeter.vue
index 07f9a5371..bee107e4c 100644
--- a/src/views/modules/sys/icvaccineprarmeter.vue
+++ b/src/views/modules/sys/icvaccineprarmeter.vue
@@ -93,25 +93,25 @@
           <el-form-item label="姓名"
                         prop="name"
                         label-width="80px">
-            <el-input v-model="dataForm.name"
+            <el-input v-model.trim="dataForm.name"
                       placeholder="姓名"
                       clearable></el-input>
           </el-form-item>
           <el-form-item label="证件号"
                         prop="idCard">
-            <el-input v-model="dataForm.idCard"
+            <el-input v-model.trim="dataForm.idCard"
                       placeholder="证件号"
                       clearable></el-input>
           </el-form-item>
           <el-form-item label="联系电话"
                         prop="mobile">
-            <el-input v-model="dataForm.mobile"
+            <el-input v-model.trim="dataForm.mobile"
                       placeholder="联系电话"
                       clearable></el-input>
           </el-form-item>
           <el-form-item label="是否接种"
                         prop="isVaccination">
-            <el-select v-model="dataForm.isVaccination"
+            <el-select v-model.trim="dataForm.isVaccination"
                        placeholder="是否接种"
                        clearable>
               <el-option v-for="item in isVaccinationArr"
diff --git a/src/views/modules/sys/log-error.vue b/src/views/modules/sys/log-error.vue
index ae0475fb6..c770eb9b9 100644
--- a/src/views/modules/sys/log-error.vue
+++ b/src/views/modules/sys/log-error.vue
@@ -3,7 +3,7 @@
     <div class="mod-sys__log-error">
       <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
         <el-form-item>
-          <el-input v-model="dataForm.module" :placeholder="$t('logError.module')" clearable></el-input>
+          <el-input v-model.trim="dataForm.module" :placeholder="$t('logError.module')" clearable></el-input>
         </el-form-item>
         <el-form-item>
           <el-button @click="getDataList()">{{ $t('query') }}</el-button>
diff --git a/src/views/modules/sys/log-login.vue b/src/views/modules/sys/log-login.vue
index dc769816c..2deb77b2d 100644
--- a/src/views/modules/sys/log-login.vue
+++ b/src/views/modules/sys/log-login.vue
@@ -3,10 +3,10 @@
     <div class="mod-sys__log-login">
       <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
         <el-form-item>
-          <el-input v-model="dataForm.creatorName" :placeholder="$t('logLogin.creatorName')" clearable></el-input>
+          <el-input v-model.trim="dataForm.creatorName" :placeholder="$t('logLogin.creatorName')" clearable></el-input>
         </el-form-item>
         <el-form-item>
-          <el-select v-model="dataForm.status" :placeholder="$t('logLogin.status')" clearable>
+          <el-select v-model.trim="dataForm.status" :placeholder="$t('logLogin.status')" clearable>
             <el-option :label="$t('logLogin.status0')" :value="0"></el-option>
             <el-option :label="$t('logLogin.status1')" :value="1"></el-option>
             <el-option :label="$t('logLogin.status2')" :value="2"></el-option>
diff --git a/src/views/modules/sys/log-operation.vue b/src/views/modules/sys/log-operation.vue
index 11c85b89c..fd7751608 100644
--- a/src/views/modules/sys/log-operation.vue
+++ b/src/views/modules/sys/log-operation.vue
@@ -3,10 +3,10 @@
     <div class="mod-sys__log-operation">
       <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
         <el-form-item>
-          <el-input v-model="dataForm.module" :placeholder="$t('logOperation.module')" clearable></el-input>
+          <el-input v-model.trim="dataForm.module" :placeholder="$t('logOperation.module')" clearable></el-input>
         </el-form-item>
         <el-form-item>
-          <el-select v-model="dataForm.status" :placeholder="$t('logOperation.status')" clearable>
+          <el-select v-model.trim="dataForm.status" :placeholder="$t('logOperation.status')" clearable>
             <el-option :label="$t('logOperation.status0')" :value="0"></el-option>
             <el-option :label="$t('logOperation.status1')" :value="1"></el-option>
           </el-select>
diff --git a/src/views/modules/sys/menu-add-or-update.vue b/src/views/modules/sys/menu-add-or-update.vue
index 1da84e5c3..701f0973b 100644
--- a/src/views/modules/sys/menu-add-or-update.vue
+++ b/src/views/modules/sys/menu-add-or-update.vue
@@ -2,16 +2,16 @@
   <el-dialog :visible.sync="visible" :title="!dataForm.id ? $t('add') : $t('update')" :close-on-click-modal="false" :close-on-press-escape="false">
     <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" label-width="120px">
       <el-form-item prop="type" :label="$t('menu.type')" size="mini">
-        <el-radio-group v-model="dataForm.type" :disabled="!!dataForm.id">
+        <el-radio-group v-model.trim="dataForm.type" :disabled="!!dataForm.id">
           <el-radio :label="0">{{ $t('menu.type0') }}</el-radio>
           <el-radio :label="1">{{ $t('menu.type1') }}</el-radio>
         </el-radio-group>
       </el-form-item>
       <el-form-item prop="name" :label="$t('menu.name')">
-        <el-input v-model="dataForm.name" :placeholder="$t('menu.name')"></el-input>
+        <el-input v-model.trim="dataForm.name" :placeholder="$t('menu.name')"></el-input>
       </el-form-item>
       <el-form-item prop="parentName" :label="$t('menu.parentName')" class="menu-list">
-        <el-popover v-model="menuListVisible" ref="menuListPopover" placement="bottom-start" trigger="click">
+        <el-popover v-model.trim="menuListVisible" ref="menuListPopover" placement="bottom-start" trigger="click">
           <el-tree
             :data="menuList"
             :props="{ label: 'name', children: 'children' }"
@@ -23,24 +23,24 @@
             @current-change="menuListTreeCurrentChangeHandle">
           </el-tree>
         </el-popover>
-        <el-input v-model="dataForm.parentName" v-popover:menuListPopover :readonly="true" :placeholder="$t('menu.parentName')">
+        <el-input v-model.trim="dataForm.parentName" v-popover:menuListPopover :readonly="true" :placeholder="$t('menu.parentName')">
           <i v-if="dataForm.pid !== '0'" slot="suffix" @click.stop="deptListTreeSetDefaultHandle()" class="el-icon-circle-close el-input__icon"></i>
         </el-input>
       </el-form-item>
       <el-form-item v-if="dataForm.type === 0" prop="url" :label="$t('menu.url')">
-        <el-input v-model="dataForm.url" :placeholder="$t('menu.url')"></el-input>
+        <el-input v-model.trim="dataForm.url" :placeholder="$t('menu.url')"></el-input>
       </el-form-item>
       <el-form-item  prop="showFlag" :label="$t('menu.showFlag')" size="mini">
-        <el-radio-group v-model="dataForm.showFlag">
+        <el-radio-group v-model.trim="dataForm.showFlag">
           <el-radio :label="1">{{ $t('menu.show1') }}</el-radio>
           <el-radio :label="0">{{ $t('menu.show2') }}</el-radio>
         </el-radio-group>
       </el-form-item>
       <el-form-item prop="sort" :label="$t('menu.sort')">
-        <el-input-number v-model="dataForm.sort" controls-position="right" :min="0" :label="$t('menu.sort')"></el-input-number>
+        <el-input-number v-model.trim="dataForm.sort" controls-position="right" :min="0" :label="$t('menu.sort')"></el-input-number>
       </el-form-item>
       <el-form-item v-if="dataForm.type === 0" prop="icon" :label="$t('menu.icon')" class="icon-list">
-        <el-popover v-model="iconListVisible" ref="iconListPopover" placement="bottom-start" trigger="click" popper-class="mod-sys__menu-icon-popover">
+        <el-popover v-model.trim="iconListVisible" ref="iconListPopover" placement="bottom-start" trigger="click" popper-class="mod-sys__menu-icon-popover">
           <div class="mod-sys__menu-icon-inner">
             <div class="mod-sys__menu-icon-list">
               <el-button
@@ -53,10 +53,10 @@
             </div>
           </div>
         </el-popover>
-        <el-input v-model="dataForm.icon" v-popover:iconListPopover :readonly="true" :placeholder="$t('menu.icon')"></el-input>
+        <el-input v-model.trim="dataForm.icon" v-popover:iconListPopover :readonly="true" :placeholder="$t('menu.icon')"></el-input>
       </el-form-item>
       <el-form-item v-if="dataForm.type === 1" prop="permissions" :label="$t('menu.permissions')">
-        <el-input v-model="dataForm.permissions" :placeholder="$t('menu.permissionsTips')"></el-input>
+        <el-input v-model.trim="dataForm.permissions" :placeholder="$t('menu.permissionsTips')"></el-input>
       </el-form-item>
       <el-form-item
         v-for="(item, index) in dataForm.resourceList"
@@ -67,8 +67,8 @@
         class="resource-list">
         <el-row>
           <el-col :span="22">
-            <el-input v-model="item.resourceUrl" :placeholder="$t('menu.resourceUrl')">
-              <el-select v-model="item.resourceMethod" slot="prepend" :placeholder="$t('menu.resourceMethod')">
+            <el-input v-model.trim="item.resourceUrl" :placeholder="$t('menu.resourceUrl')">
+              <el-select v-model.trim="item.resourceMethod" slot="prepend" :placeholder="$t('menu.resourceMethod')">
                 <el-option label="GET" value="GET"></el-option>
                 <el-option label="POST" value="POST"></el-option>
                 <el-option label="PUT" value="PUT"></el-option>
diff --git a/src/views/modules/sys/news-add-or-update.vue b/src/views/modules/sys/news-add-or-update.vue
index 3c975a24f..5696a8db9 100644
--- a/src/views/modules/sys/news-add-or-update.vue
+++ b/src/views/modules/sys/news-add-or-update.vue
@@ -2,7 +2,7 @@
   <el-dialog :visible.sync="visible" :title="!dataForm.id ? $t('add') : $t('update')" :close-on-click-modal="false" :close-on-press-escape="false">
     <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" label-width="120px">
       <el-form-item prop="title" :label="$t('news.title')">
-        <el-input v-model="dataForm.title" :placeholder="$t('news.title')"></el-input>
+        <el-input v-model.trim="dataForm.title" :placeholder="$t('news.title')"></el-input>
       </el-form-item>
       <el-form-item prop="content" :label="$t('news.content')">
         <!-- 富文本编辑器, 容器 -->
@@ -18,7 +18,7 @@
         </el-upload>
       </el-form-item>
       <el-form-item prop="pubDate" :label="$t('news.pubDate')">
-        <el-date-picker v-model="dataForm.pubDate" type="datetime" value-format="yyyy-MM-dd HH:mm:ss" :placeholder="$t('news.pubDate')"></el-date-picker>
+        <el-date-picker v-model.trim="dataForm.pubDate" type="datetime" value-format="yyyy-MM-dd HH:mm:ss" :placeholder="$t('news.pubDate')"></el-date-picker>
       </el-form-item>
     </el-form>
     <template slot="footer">
diff --git a/src/views/modules/sys/news.vue b/src/views/modules/sys/news.vue
index 44828262c..965257d2a 100644
--- a/src/views/modules/sys/news.vue
+++ b/src/views/modules/sys/news.vue
@@ -3,11 +3,11 @@
     <div class="mod-demo__news">
       <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
         <el-form-item>
-          <el-input v-model="dataForm.title" :placeholder="$t('news.title')" clearable></el-input>
+          <el-input v-model.trim="dataForm.title" :placeholder="$t('news.title')" clearable></el-input>
         </el-form-item>
         <el-form-item>
           <el-date-picker
-            v-model="daterange"
+            v-model.trim="daterange"
             type="daterange"
             value-format="yyyy-MM-dd"
             :range-separator="$t('datePicker.range')"
diff --git a/src/views/modules/sys/params-add-or-update.vue b/src/views/modules/sys/params-add-or-update.vue
index df61ea8ff..1ca574611 100644
--- a/src/views/modules/sys/params-add-or-update.vue
+++ b/src/views/modules/sys/params-add-or-update.vue
@@ -2,13 +2,13 @@
   <el-dialog :visible.sync="visible" :title="!dataForm.id ? $t('add') : $t('update')" :close-on-click-modal="false" :close-on-press-escape="false">
     <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" label-width="120px">
       <el-form-item prop="paramCode" :label="$t('params.paramCode')">
-        <el-input v-model="dataForm.paramCode" :placeholder="$t('params.paramCode')"></el-input>
+        <el-input v-model.trim="dataForm.paramCode" :placeholder="$t('params.paramCode')"></el-input>
       </el-form-item>
       <el-form-item prop="paramValue" :label="$t('params.paramValue')">
-        <el-input v-model="dataForm.paramValue" :placeholder="$t('params.paramValue')"></el-input>
+        <el-input v-model.trim="dataForm.paramValue" :placeholder="$t('params.paramValue')"></el-input>
       </el-form-item>
       <el-form-item prop="remark" :label="$t('params.remark')">
-        <el-input v-model="dataForm.remark" :placeholder="$t('params.remark')"></el-input>
+        <el-input v-model.trim="dataForm.remark" :placeholder="$t('params.remark')"></el-input>
       </el-form-item>
     </el-form>
     <template slot="footer">
diff --git a/src/views/modules/sys/params.vue b/src/views/modules/sys/params.vue
index 1600a8ecc..78b52c7e1 100644
--- a/src/views/modules/sys/params.vue
+++ b/src/views/modules/sys/params.vue
@@ -6,7 +6,7 @@
                :model="dataForm"
                @keyup.enter.native="getDataList()">
         <el-form-item>
-          <el-input v-model="dataForm.paramCode"
+          <el-input v-model.trim="dataForm.paramCode"
                     :placeholder="$t('params.paramCode')"
                     clearable></el-input>
         </el-form-item>
diff --git a/src/views/modules/sys/region-add-or-update.vue b/src/views/modules/sys/region-add-or-update.vue
index 67efce4c3..0ec87eef0 100644
--- a/src/views/modules/sys/region-add-or-update.vue
+++ b/src/views/modules/sys/region-add-or-update.vue
@@ -2,16 +2,16 @@
   <el-dialog :visible.sync="visible" :title="insert ? $t('add') : $t('update')" :close-on-click-modal="false" :close-on-press-escape="false">
     <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" label-width="120px">
       <el-form-item prop="parentName" :label="$t('region.parentName')">
-        <ren-region-tree v-model="dataForm.pid" :placeholder="$t('region.select')" :parent-name.sync="dataForm.parentName"></ren-region-tree>
+        <ren-region-tree v-model.trim="dataForm.pid" :placeholder="$t('region.select')" :parent-name.sync="dataForm.parentName"></ren-region-tree>
       </el-form-item>
       <el-form-item prop="name" :label="$t('region.name')">
-        <el-input v-model="dataForm.name" :placeholder="$t('region.name')"></el-input>
+        <el-input v-model.trim="dataForm.name" :placeholder="$t('region.name')"></el-input>
       </el-form-item>
       <el-form-item prop="id" :label="$t('region.id')">
-        <el-input v-model="dataForm.id" :disabled="!insert" :placeholder="$t('region.id')"></el-input>
+        <el-input v-model.trim="dataForm.id" :disabled="!insert" :placeholder="$t('region.id')"></el-input>
       </el-form-item>
       <el-form-item prop="sort" :label="$t('region.sort')">
-        <el-input-number v-model="dataForm.sort" controls-position="right" :min="0" :label="$t('region.sort')"></el-input-number>
+        <el-input-number v-model.trim="dataForm.sort" controls-position="right" :min="0" :label="$t('region.sort')"></el-input-number>
       </el-form-item>
     </el-form>
     <template slot="footer">
diff --git a/src/views/modules/sys/role-add-or-update.vue b/src/views/modules/sys/role-add-or-update.vue
index c645b634f..2b4e27e2a 100644
--- a/src/views/modules/sys/role-add-or-update.vue
+++ b/src/views/modules/sys/role-add-or-update.vue
@@ -2,10 +2,10 @@
   <el-dialog :visible.sync="visible" :title="!dataForm.id ? $t('add') : $t('update')" :close-on-click-modal="false" :close-on-press-escape="false">
     <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" label-width="120px">
       <el-form-item prop="name" :label="$t('role.name')">
-        <el-input v-model="dataForm.name" :placeholder="$t('role.name')"></el-input>
+        <el-input v-model.trim="dataForm.name" :placeholder="$t('role.name')"></el-input>
       </el-form-item>
       <el-form-item prop="remark" :label="$t('role.remark')">
-        <el-input v-model="dataForm.remark" :placeholder="$t('role.remark')"></el-input>
+        <el-input v-model.trim="dataForm.remark" :placeholder="$t('role.remark')"></el-input>
       </el-form-item>
       <el-row>
         <el-col :span="12">
diff --git a/src/views/modules/sys/role.vue b/src/views/modules/sys/role.vue
index a3a87e383..a0bdc69c4 100644
--- a/src/views/modules/sys/role.vue
+++ b/src/views/modules/sys/role.vue
@@ -6,7 +6,7 @@
                :model="dataForm"
                @keyup.enter.native="getDataList()">
         <el-form-item>
-          <el-input v-model="dataForm.name"
+          <el-input v-model.trim="dataForm.name"
                     :placeholder="$t('role.name')"
                     clearable></el-input>
         </el-form-item>
diff --git a/src/views/modules/sys/roomForm.vue b/src/views/modules/sys/roomForm.vue
index 77b940c71..ed1342bf2 100644
--- a/src/views/modules/sys/roomForm.vue
+++ b/src/views/modules/sys/roomForm.vue
@@ -19,7 +19,7 @@
                       label-width="150px"
                       style="display: block">
           <el-select class="item_width_1"
-                     v-model="dataForm.buildingUnitId"
+                     v-model.trim="dataForm.buildingUnitId"
                      placeholder="请选择"
                      clearable>
             <el-option v-for="item in unitList"
@@ -36,7 +36,7 @@
                       style="display: block">
           <el-input class="item_width_1"
                     placeholder="请输入门牌号"
-                    v-model="dataForm.doorName">
+                    v-model.trim="dataForm.doorName">
           </el-input>
         </el-form-item>
         <el-form-item v-if="formType != 'detail'" label="房屋编码"
@@ -46,7 +46,7 @@
           <el-input class="item_width_2"
                     maxlength="50"
                     placeholder="请输入楼栋编码"
-                    v-model="dataForm.coding">
+                    v-model.trim="dataForm.coding">
           
           </el-input>
           <el-button style="margin-left: 10px"
@@ -61,7 +61,7 @@
                         style="display: block">
             <el-input class="item_width_1"
                       maxlength="30"
-                      v-model="dataForm.houseCode">
+                      v-model.trim="dataForm.houseCode">
             </el-input>
           </el-form-item>
           <div v-if="dataForm.houseQrcodeUrl"
@@ -78,7 +78,7 @@
                       prop="realPerson"
                       label-width="150px">
           <el-input-number class="item_width_4"
-                           v-model="dataForm.realPerson"
+                           v-model.trim="dataForm.realPerson"
                            :min="0"
                            :max="9999"
                            label="居住人数"></el-input-number>
@@ -87,7 +87,7 @@
                       prop="houseType"
                       label-width="150px"
                       style="display: block">
-          <el-radio-group v-model="houseType">
+          <el-radio-group v-model.trim="houseType">
 
             <el-radio :label="'1'">楼房</el-radio>
             <el-radio :label="'2'">平房</el-radio>
@@ -99,7 +99,7 @@
                       prop="purpose"
                       label-width="150px"
                       style="display: block">
-          <el-radio-group v-model="purpose">
+          <el-radio-group v-model.trim="purpose">
 
             <el-radio :label="'1'">住宅</el-radio>
             <el-radio :label="'2'">商业</el-radio>
@@ -115,7 +115,7 @@
                       prop="rentFlag"
                       label-width="150px"
                       style="display: block">
-          <el-radio-group v-model="rentFlag">
+          <el-radio-group v-model.trim="rentFlag">
 
             <el-radio :label="1">出租</el-radio>
             <el-radio :label="2">闲置</el-radio>
@@ -132,7 +132,7 @@
           <el-input class="item_width_1"
                     maxlength="30"
                     placeholder="请输入房主姓名"
-                    v-model="dataForm.ownerName">
+                    v-model.trim="dataForm.ownerName">
           </el-input>
         </el-form-item>
         <el-form-item label="联系方式"
@@ -142,7 +142,7 @@
           <el-input class="item_width_1"
                     type='number'
                     placeholder="请输入联系方式"
-                    v-model="dataForm.ownerPhone">
+                    v-model.trim="dataForm.ownerPhone">
           </el-input>
         </el-form-item>
         <el-form-item label="房主证件号"
@@ -151,7 +151,7 @@
                       style="display: block">
           <el-input class="item_width_1"
                     placeholder="请输入房主证件号"
-                    v-model="dataForm.ownerIdCard">
+                    v-model.trim="dataForm.ownerIdCard">
           </el-input>
         </el-form-item>
         <el-form-item label="备注"
@@ -161,7 +161,7 @@
           <el-input class="item_width_1"
                     maxlength="30"
                     placeholder="请输入备注"
-                    v-model="dataForm.remark">
+                    v-model.trim="dataForm.remark">
           </el-input>
         </el-form-item>
       </el-form>
diff --git a/src/views/modules/sys/user-add-or-update.vue b/src/views/modules/sys/user-add-or-update.vue
index 4ae28a19e..9b8b6c405 100644
--- a/src/views/modules/sys/user-add-or-update.vue
+++ b/src/views/modules/sys/user-add-or-update.vue
@@ -10,17 +10,17 @@
              label-width="120px">
       <el-form-item prop="username"
                     :label="$t('user.username')">
-        <el-input v-model="dataForm.realName"
+        <el-input v-model.trim="dataForm.realName"
                   :placeholder="$t('user.username')"></el-input>
       </el-form-item>
       <!--      <el-form-item prop="deptName" :label="$t('user.deptName')">-->
-      <!--        <ren-dept-tree v-model="dataForm.deptId" :placeholder="$t('dept.title')" :dept-name.sync="dataForm.deptName"></ren-dept-tree>-->
+      <!--        <ren-dept-tree v-model.trim="dataForm.deptId" :placeholder="$t('dept.title')" :dept-name.sync="dataForm.deptName"></ren-dept-tree>-->
       <!--      </el-form-item>-->
       <el-form-item v-if="!dataForm.id"
                     prop="password"
                     :label="$t('user.password')"
                     :class="{ 'is-required': !dataForm.id }">
-        <el-input v-model="dataForm.password"
+        <el-input v-model.trim="dataForm.password"
                   type="password"
                   :placeholder="$t('user.password')"></el-input>
       </el-form-item>
@@ -28,17 +28,17 @@
                     prop="confirmPassword"
                     :label="$t('user.confirmPassword')"
                     :class="{ 'is-required': !dataForm.id }">
-        <el-input v-model="dataForm.confirmPassword"
+        <el-input v-model.trim="dataForm.confirmPassword"
                   type="password"
                   :placeholder="$t('user.confirmPassword')"></el-input>
       </el-form-item>
       <!--      <el-form-item prop="realName" :label="$t('user.realName')">-->
-      <!--        <el-input v-model="dataForm.realName" :placeholder="$t('user.realName')"></el-input>-->
+      <!--        <el-input v-model.trim="dataForm.realName" :placeholder="$t('user.realName')"></el-input>-->
       <!--      </el-form-item>-->
       <el-form-item prop="gender"
                     :label="$t('user.gender')"
                     size="mini">
-        <el-radio-group v-model="dataForm.gender">
+        <el-radio-group v-model.trim="dataForm.gender">
           <el-radio :label="0">{{ $t('user.gender0') }}</el-radio>
           <el-radio :label="1">{{ $t('user.gender1') }}</el-radio>
           <el-radio :label="2">{{ $t('user.gender2') }}</el-radio>
@@ -46,18 +46,18 @@
       </el-form-item>
       <el-form-item prop="email"
                     :label="$t('user.email')">
-        <el-input v-model="dataForm.email"
+        <el-input v-model.trim="dataForm.email"
                   :placeholder="$t('user.email')"></el-input>
       </el-form-item>
       <el-form-item prop="phone"
                     :label="$t('user.mobile')">
-        <el-input v-model="dataForm.phone"
+        <el-input v-model.trim="dataForm.phone"
                   :placeholder="$t('user.mobile')"></el-input>
       </el-form-item>
       <el-form-item prop="roleIdList"
                     :label="$t('user.roleIdList')"
                     class="role-list">
-        <el-select v-model="dataForm.roleIdList"
+        <el-select v-model.trim="dataForm.roleIdList"
                    multiple
                    :placeholder="$t('user.roleIdList')">
           <el-option v-for="role in roleList"
@@ -69,7 +69,7 @@
       <el-form-item prop="status"
                     :label="$t('user.status')"
                     size="mini">
-        <el-radio-group v-model="dataForm.status">
+        <el-radio-group v-model.trim="dataForm.status">
           <el-radio :label="0">{{ $t('user.status0') }}</el-radio>
           <el-radio :label="1">{{ $t('user.status1') }}</el-radio>
         </el-radio-group>
diff --git a/src/views/modules/sys/user.vue b/src/views/modules/sys/user.vue
index c17ce12af..d71a44232 100644
--- a/src/views/modules/sys/user.vue
+++ b/src/views/modules/sys/user.vue
@@ -6,7 +6,7 @@
                :model="dataForm"
                @keyup.enter.native="getDataList()">
         <el-form-item>
-          <el-input v-model="dataForm.realName"
+          <el-input v-model.trim="dataForm.realName"
                     :placeholder="$t('user.realName')"
                     clearable></el-input>
         </el-form-item>
diff --git a/src/views/modules/systemManagement/serviceMatter/serviceForm.vue b/src/views/modules/systemManagement/serviceMatter/serviceForm.vue
index b9fb974a4..0c25074df 100644
--- a/src/views/modules/systemManagement/serviceMatter/serviceForm.vue
+++ b/src/views/modules/systemManagement/serviceMatter/serviceForm.vue
@@ -17,7 +17,7 @@
                       maxlength="20"
                       show-word-limit
                       placeholder="请输入分类名称"
-                      v-model="formData.categoryName">
+                      v-model.trim="formData.categoryName">
             </el-input>
           </el-form-item>
 
@@ -26,7 +26,7 @@
                         prop="awardPoint"
                         label-width="150px">
             <el-input-number class="item_width_1"
-                             v-model="formData.awardPoint"
+                             v-model.trim="formData.awardPoint"
                              :min="0"
                              label="奖励积分"></el-input-number>
           </el-form-item>
diff --git a/src/views/modules/visual/basicinfo/basicInfoCommunity.vue b/src/views/modules/visual/basicinfo/basicInfoCommunity.vue
index e28220ff8..71a34b238 100644
--- a/src/views/modules/visual/basicinfo/basicInfoCommunity.vue
+++ b/src/views/modules/visual/basicinfo/basicInfoCommunity.vue
@@ -8,7 +8,7 @@
            alt />
 
       <div class="second-select">
-        <el-select v-model="selBuildingId"
+        <el-select v-model.trim="selBuildingId"
                    :popper-append-to-body="false"
                    placeholder="请选择"
                    @click="handleCloseAllUser()">
@@ -72,7 +72,7 @@
                    alt /> -->
             </div>
 
-            <el-popover v-model="item.showAllUser"
+            <el-popover v-model.trim="item.showAllUser"
                         placement="bottom"
                         width="50"
                         popper-class="my_popover"
diff --git a/src/views/modules/visual/basicinfo/peopleSearch.vue b/src/views/modules/visual/basicinfo/peopleSearch.vue
index 160afc19d..f59f78a1a 100644
--- a/src/views/modules/visual/basicinfo/peopleSearch.vue
+++ b/src/views/modules/visual/basicinfo/peopleSearch.vue
@@ -20,7 +20,7 @@
         <el-input size="mini"
                   WarningColor='warning'
                   placeholder="请输入姓名"
-                  v-model="searchName">
+                  v-model.trim="searchName">
           <i slot="prefix"
              class="icon">
             <img src="../../../../assets/img/modules/visual/sousuo.png"
diff --git a/src/views/modules/visual/basicinfo/personCategory/index.vue b/src/views/modules/visual/basicinfo/personCategory/index.vue
index a3c01d523..7aeba2d16 100644
--- a/src/views/modules/visual/basicinfo/personCategory/index.vue
+++ b/src/views/modules/visual/basicinfo/personCategory/index.vue
@@ -27,7 +27,7 @@
 
               <el-cascader class="customer_cascader"
                            ref="myCascader"
-                           v-model="agencyIdArray"
+                           v-model.trim="agencyIdArray"
                            :key="iscascaderShow"
                            :options="casOptions"
                            :props="optionProps"
@@ -36,7 +36,7 @@
             </div>
             <div class="second-select range-data2">
 
-              <el-date-picker v-model="dateIdShow"
+              <el-date-picker v-model.trim="dateIdShow"
                               type="date"
                               :clearable="false"
                               @change="handleChangeDate"
diff --git a/src/views/modules/visual/command/index.vue b/src/views/modules/visual/command/index.vue
index 5347986f3..7000ae974 100644
--- a/src/views/modules/visual/command/index.vue
+++ b/src/views/modules/visual/command/index.vue
@@ -40,7 +40,7 @@
                         <input type="text"
                                placeholder="请输入"
                                @keyup.enter="handleSearch"
-                               v-model="searchName" />
+                               v-model.trim="searchName" />
                         <img v-show="searchName"
                              class="i-close"
                              @click="clearSearch"
diff --git a/src/views/modules/visual/command/indexOld.vue b/src/views/modules/visual/command/indexOld.vue
index 56017d830..81cdfb1e2 100644
--- a/src/views/modules/visual/command/indexOld.vue
+++ b/src/views/modules/visual/command/indexOld.vue
@@ -46,7 +46,7 @@
               type="text"
               placeholder="请输入"
               @keyup.enter="handleSearch"
-              v-model="searchName"
+              v-model.trim="searchName"
             />
             <img
               v-show="searchName"
diff --git a/src/views/modules/visual/communityGovern/distributionAnalyze.vue b/src/views/modules/visual/communityGovern/distributionAnalyze.vue
index c8220f5f1..2382ea4bc 100644
--- a/src/views/modules/visual/communityGovern/distributionAnalyze.vue
+++ b/src/views/modules/visual/communityGovern/distributionAnalyze.vue
@@ -11,7 +11,7 @@
 
             <el-cascader class="customer_cascader"
                          ref="myCascader"
-                         v-model="agencyIdArray"
+                         v-model.trim="agencyIdArray"
                          :key="iscascaderShow"
                          :options="casOptions"
                          :props="optionProps"
@@ -19,7 +19,7 @@
                          @change="handleChangeAgency"></el-cascader>
           </div>
           <div class="second-select range-data">
-            <el-date-picker v-model="timeRange"
+            <el-date-picker v-model.trim="timeRange"
                             type="daterange"
                             range-separator="至"
                             start-placeholder="开始日期"
diff --git a/src/views/modules/visual/communityGovern/fivelayers/mapIndex copy 2.vue b/src/views/modules/visual/communityGovern/fivelayers/mapIndex copy 2.vue
index a923c612d..88d10d768 100644
--- a/src/views/modules/visual/communityGovern/fivelayers/mapIndex copy 2.vue	
+++ b/src/views/modules/visual/communityGovern/fivelayers/mapIndex copy 2.vue	
@@ -69,7 +69,7 @@
             <el-input size="mini"
                       WarningColor='warning'
                       placeholder="请输入搜索内容"
-                      v-model="search">
+                      v-model.trim="search">
               <i slot="prefix"
                  class="icon">
                 <img src="../../../../../assets/img/modules/visual/sousuo.png"
diff --git a/src/views/modules/visual/communityGovern/fivelayers/mapIndex copy.vue b/src/views/modules/visual/communityGovern/fivelayers/mapIndex copy.vue
index ed864430c..876a90952 100644
--- a/src/views/modules/visual/communityGovern/fivelayers/mapIndex copy.vue	
+++ b/src/views/modules/visual/communityGovern/fivelayers/mapIndex copy.vue	
@@ -69,7 +69,7 @@
             <el-input size="mini"
                       WarningColor='warning'
                       placeholder="请输入搜索内容"
-                      v-model="search">
+                      v-model.trim="search">
               <i slot="prefix"
                  class="icon">
                 <img src="../../../../../assets/img/modules/visual/sousuo.png"
diff --git a/src/views/modules/visual/communityGovern/fivelayers/mapIndex-baidu.vue b/src/views/modules/visual/communityGovern/fivelayers/mapIndex-baidu.vue
index 23dbc85b0..afafa76b7 100644
--- a/src/views/modules/visual/communityGovern/fivelayers/mapIndex-baidu.vue
+++ b/src/views/modules/visual/communityGovern/fivelayers/mapIndex-baidu.vue
@@ -69,7 +69,7 @@
             <el-input size="mini"
                       WarningColor='warning'
                       placeholder="请输入搜索内容"
-                      v-model="search">
+                      v-model.trim="search">
               <i slot="prefix"
                  class="icon">
                 <img src="../../../../../assets/img/modules/visual/sousuo.png"
diff --git a/src/views/modules/visual/communityGovern/fivelayers/mapIndex.vue b/src/views/modules/visual/communityGovern/fivelayers/mapIndex.vue
index dfb9c2fe7..1ecb88ce9 100644
--- a/src/views/modules/visual/communityGovern/fivelayers/mapIndex.vue
+++ b/src/views/modules/visual/communityGovern/fivelayers/mapIndex.vue
@@ -66,7 +66,7 @@
                             <el-input size="mini"
                                       WarningColor='warning'
                                       placeholder="请输入搜索内容"
-                                      v-model="search">
+                                      v-model.trim="search">
                                 <i slot="prefix"
                                    class="icon">
                                     <img src="../../../../../assets/img/modules/visual/sousuo.png"
diff --git a/src/views/modules/visual/communityGovern/processAnalyze.vue b/src/views/modules/visual/communityGovern/processAnalyze.vue
index 10a3b49b7..4e2e9c3c5 100644
--- a/src/views/modules/visual/communityGovern/processAnalyze.vue
+++ b/src/views/modules/visual/communityGovern/processAnalyze.vue
@@ -8,7 +8,7 @@
         <div class="second-select cascader">
           <el-cascader class="customer_cascader"
                        ref="myCascader"
-                       v-model="agencyIdArray"
+                       v-model.trim="agencyIdArray"
                        :key="iscascaderShow"
                        :options="casOptions"
                        :props="optionProps"
@@ -16,7 +16,7 @@
                        @change="handleChangeAgency"></el-cascader>
         </div>
         <div class="second-select one-date">
-          <el-date-picker v-model="dateIdShow"
+          <el-date-picker v-model.trim="dateIdShow"
                           type="date"
                           :clearable="false"
                           @change="handleChangeDate"
diff --git a/src/views/modules/visual/communityGovern/resibuzz.vue b/src/views/modules/visual/communityGovern/resibuzz.vue
index 1b139b3f5..9fe7dd887 100644
--- a/src/views/modules/visual/communityGovern/resibuzz.vue
+++ b/src/views/modules/visual/communityGovern/resibuzz.vue
@@ -8,7 +8,7 @@
 
           <el-cascader class="customer_cascader"
                        ref="myCascader"
-                       v-model="agencyIdArray"
+                       v-model.trim="agencyIdArray"
                        :key="iscascaderShow"
                        :options="casOptions"
                        :props="optionProps"
@@ -16,7 +16,7 @@
                        @change="handleChangeAgency"></el-cascader>
         </div>
         <div class="second-select ">
-          <el-select v-model="status"
+          <el-select v-model.trim="status"
                      :popper-append-to-body="false"
                      placeholder="请选择">
             <el-option v-for="(item,index) in stateArray"
diff --git a/src/views/modules/visual/communityGovern/shijianchuli/shijianchulifenxi copy.vue b/src/views/modules/visual/communityGovern/shijianchuli/shijianchulifenxi copy.vue
index 5b92ffbc8..0b4bef480 100644
--- a/src/views/modules/visual/communityGovern/shijianchuli/shijianchulifenxi copy.vue	
+++ b/src/views/modules/visual/communityGovern/shijianchuli/shijianchulifenxi copy.vue	
@@ -8,7 +8,7 @@
         <div class="second-select cascader">
           <el-cascader class="customer_cascader"
                        ref="myCascader"
-                       v-model="agencyIdArray"
+                       v-model.trim="agencyIdArray"
                        :key="iscascaderShow"
                        :options="casOptions"
                        :props="optionProps"
@@ -16,7 +16,7 @@
                        @change="handleChangeAgency"></el-cascader>
         </div>
         <div class="second-select">
-          <el-select v-model="dataType"
+          <el-select v-model.trim="dataType"
                      :popper-append-to-body="false"
                      placeholder="请选择">
             <el-option v-for="(item) in dateArray"
@@ -31,7 +31,7 @@
         <div v-if="dataType==='0'"
              class="second-select range-data">
 
-          <el-date-picker v-model="timeRange"
+          <el-date-picker v-model.trim="timeRange"
                           type="daterange"
                           range-separator="至"
                           start-placeholder="开始日期"
diff --git a/src/views/modules/visual/communityGovern/shijianchuli/shijianchulifenxi.vue b/src/views/modules/visual/communityGovern/shijianchuli/shijianchulifenxi.vue
index b3b909fe5..15ce15ae3 100644
--- a/src/views/modules/visual/communityGovern/shijianchuli/shijianchulifenxi.vue
+++ b/src/views/modules/visual/communityGovern/shijianchuli/shijianchulifenxi.vue
@@ -9,7 +9,7 @@
           <el-cascader
             class="customer_cascader"
             ref="myCascader"
-            v-model="agencyIdArray"
+            v-model.trim="agencyIdArray"
             :key="iscascaderShow"
             :options="casOptions"
             :props="optionProps"
@@ -19,7 +19,7 @@
         </div>
         <div class="second-select">
           <el-select
-            v-model="dataType"
+            v-model.trim="dataType"
             :popper-append-to-body="false"
             placeholder="请选择"
           >
@@ -36,7 +36,7 @@
 
         <div v-if="dataType === '0'" class="second-select range-data">
           <el-date-picker
-            v-model="timeRange"
+            v-model.trim="timeRange"
             type="daterange"
             range-separator="至"
             start-placeholder="开始日期"
diff --git a/src/views/modules/visual/communityGovern/shijianfenlei/shijianfenleifenxi.vue b/src/views/modules/visual/communityGovern/shijianfenlei/shijianfenleifenxi.vue
index 47fb8461d..4cbd7b2de 100644
--- a/src/views/modules/visual/communityGovern/shijianfenlei/shijianfenleifenxi.vue
+++ b/src/views/modules/visual/communityGovern/shijianfenlei/shijianfenleifenxi.vue
@@ -8,7 +8,7 @@
         <div class="second-select cascader">
           <el-cascader class="customer_cascader"
                        ref="myCascader"
-                       v-model="agencyIdArray"
+                       v-model.trim="agencyIdArray"
                        :key="iscascaderShow"
                        :options="casOptions"
                        :props="optionProps"
@@ -16,7 +16,7 @@
                        @change="handleChangeAgency"></el-cascader>
         </div>
         <div class="second-select">
-          <el-select v-model="dataType"
+          <el-select v-model.trim="dataType"
                      :popper-append-to-body="false"
                      placeholder="请选择">
             <el-option v-for="item in dateArray"
@@ -31,7 +31,7 @@
         <div v-if="dataType==='0'"
              class="second-select range-data">
 
-          <el-date-picker v-model="timeRange"
+          <el-date-picker v-model.trim="timeRange"
                           type="daterange"
                           range-separator="至"
                           start-placeholder="开始日期"
diff --git a/src/views/modules/visual/communityGovern/typeAnalyze.vue b/src/views/modules/visual/communityGovern/typeAnalyze.vue
index b1987c481..804e0642f 100644
--- a/src/views/modules/visual/communityGovern/typeAnalyze.vue
+++ b/src/views/modules/visual/communityGovern/typeAnalyze.vue
@@ -8,7 +8,7 @@
 
           <el-cascader class="customer_cascader"
                        ref="myCascader"
-                       v-model="agencyIdArray"
+                       v-model.trim="agencyIdArray"
                        :key="iscascaderShow"
                        :options="casOptions"
                        :props="optionProps"
@@ -17,7 +17,7 @@
         </div>
         <div class="second-select one-date">
 
-          <el-date-picker v-model="dateIdShow"
+          <el-date-picker v-model.trim="dateIdShow"
                           type="date"
                           :clearable="false"
                           @change="handleChangeDate"
diff --git a/src/views/modules/visual/communityGovern/zhongdianxingcheng/zhongdianxingcheng.vue b/src/views/modules/visual/communityGovern/zhongdianxingcheng/zhongdianxingcheng.vue
index 189171763..68731742d 100644
--- a/src/views/modules/visual/communityGovern/zhongdianxingcheng/zhongdianxingcheng.vue
+++ b/src/views/modules/visual/communityGovern/zhongdianxingcheng/zhongdianxingcheng.vue
@@ -8,7 +8,7 @@
 
           <!-- <el-cascader class="customer_cascader"
                        ref="myCascader"
-                       v-model="agencyIdArray"
+                       v-model.trim="agencyIdArray"
                        :key="iscascaderShow"
                        :options="casOptions"
                        :props="optionProps"
@@ -16,7 +16,7 @@
                        @change="handleChangeAgency"></el-cascader> -->
 
           <el-cascader ref="sourceArea"
-                       v-model="sourceAllCode"
+                       v-model.trim="sourceAllCode"
                        class="customer_cascader"
                        :props="areaProps"
                        @change="handleAreaChange"
diff --git a/src/views/modules/visual/communityParty/community.vue b/src/views/modules/visual/communityParty/community.vue
index 1bcc1beee..e2cdae25d 100644
--- a/src/views/modules/visual/communityParty/community.vue
+++ b/src/views/modules/visual/communityParty/community.vue
@@ -6,7 +6,7 @@
              src="../../../../assets/img/shuju/title-tip.png" />
         <div class="title-label">
           联建单位分析&nbsp;&nbsp;
-          <el-cascader v-model="selectAgency"
+          <el-cascader v-model.trim="selectAgency"
                        :options="propTree"
                        :props="{ checkStrictly: true }"
                        :show-all-levels="false"
@@ -16,7 +16,7 @@
 
         </div>
         <!-- <div class="second-select">
-          <el-select v-model="serviceMatter"
+          <el-select v-model.trim="serviceMatter"
                      placeholder="请选择"
                      @change="handleSelectChange"
                      @clear="handleSelectChange">
@@ -28,7 +28,7 @@
           </el-select>
         </div>
         <div class="second-select">
-          <el-date-picker v-model="timeRange"
+          <el-date-picker v-model.trim="timeRange"
                           type="daterange"
                           range-separator="至"
                           start-placeholder="开始日期"
@@ -125,7 +125,7 @@
 
         </div>
         <div class="second-select">
-          <el-select v-model="serviceMatter"
+          <el-select v-model.trim="serviceMatter"
                      placeholder="请选择"
                      @change="handleSelectChange"
                      @clear="handleSelectChange">
@@ -137,7 +137,7 @@
           </el-select>
         </div>
         <div class="second-select">
-          <el-date-picker v-model="timeRange"
+          <el-date-picker v-model.trim="timeRange"
                           type="daterange"
                           range-separator="至"
                           start-placeholder="开始日期"
diff --git a/src/views/modules/visual/communityParty/elegant.vue b/src/views/modules/visual/communityParty/elegant.vue
index 2e9741293..4284675a1 100644
--- a/src/views/modules/visual/communityParty/elegant.vue
+++ b/src/views/modules/visual/communityParty/elegant.vue
@@ -6,7 +6,7 @@
              src="../../../../assets/img/shuju/title-tip.png" />
         <div class="title-label">
           党员风采榜&nbsp;&nbsp;
-          <!-- <el-cascader v-model="selectAgency"
+          <!-- <el-cascader v-model.trim="selectAgency"
                        :options="propTree"
                        :props="{ checkStrictly: true }"
                        :show-all-levels="false"
@@ -16,7 +16,7 @@
 
         </div>
         <!-- <div class="second-select">
-          <el-select v-model="serviceMatter"
+          <el-select v-model.trim="serviceMatter"
                      placeholder="请选择"
                      @change="handleSelectChange"
                      @clear="handleSelectChange">
@@ -28,7 +28,7 @@
           </el-select>
         </div>
         <div class="second-select">
-          <el-date-picker v-model="timeRange"
+          <el-date-picker v-model.trim="timeRange"
                           type="daterange"
                           range-separator="至"
                           start-placeholder="开始日期"
diff --git a/src/views/modules/visual/communityParty/gridParty.vue b/src/views/modules/visual/communityParty/gridParty.vue
index e7fd1d306..5a716dda6 100644
--- a/src/views/modules/visual/communityParty/gridParty.vue
+++ b/src/views/modules/visual/communityParty/gridParty.vue
@@ -6,7 +6,7 @@
         <div class="title-label">
           网格党建平面图&nbsp;&nbsp;
           <!-- <el-cascader 
-            v-model="selectAgency"
+            v-model.trim="selectAgency"
             :options="propTree" 
             :props="{ checkStrictly: true }" 
             :show-all-levels="false"
diff --git a/src/views/modules/visual/communityParty/party.vue b/src/views/modules/visual/communityParty/party.vue
index d0971ca94..ac8285d10 100644
--- a/src/views/modules/visual/communityParty/party.vue
+++ b/src/views/modules/visual/communityParty/party.vue
@@ -7,14 +7,14 @@
         <div class="title-label">
           党员信息统计&nbsp;&nbsp;
           <!-- <el-cascader 
-            v-model="selectAgency"
+            v-model.trim="selectAgency"
             :options="propTree" 
             :props="{ checkStrictly: true }" 
             :show-all-levels="false"
             :getCheckedNodes="getCheckedNodes"
             clearable @change="handleCascader">
           </el-cascader> -->
-          <el-cascader v-model="partyOrgs"
+          <el-cascader v-model.trim="partyOrgs"
                        :options="partyOrgList"
                        :props="{
               label: 'partyOrgName',
diff --git a/src/views/modules/visual/communityParty/partyOld.vue b/src/views/modules/visual/communityParty/partyOld.vue
index 6eeb9ed22..fa05ccd99 100644
--- a/src/views/modules/visual/communityParty/partyOld.vue
+++ b/src/views/modules/visual/communityParty/partyOld.vue
@@ -6,7 +6,7 @@
         <div class="title-label">
           党员信息统计&nbsp;&nbsp;
           <el-cascader 
-            v-model="selectAgency"
+            v-model.trim="selectAgency"
             :options="propTree" 
             :props="{ checkStrictly: true }" 
             :show-all-levels="false"
diff --git a/src/views/modules/visual/components/screen-map/index.vue b/src/views/modules/visual/components/screen-map/index.vue
index 207a17f4e..939f03a49 100644
--- a/src/views/modules/visual/components/screen-map/index.vue
+++ b/src/views/modules/visual/components/screen-map/index.vue
@@ -1,8 +1,8 @@
 <template>
     <div class="div_content_map">
         <!-- <div>
-      <el-input v-model="input_lat"></el-input>
-      <el-input v-model="input_lon"></el-input>
+      <el-input v-model.trim="input_lat"></el-input>
+      <el-input v-model.trim="input_lon"></el-input>
       <el-button @click="showPosition"></el-button>
     </div> -->
 
diff --git a/src/views/modules/visual/cpts/tb copy 3.vue b/src/views/modules/visual/cpts/tb copy 3.vue
index f96c7fb1b..d7a772a9d 100644
--- a/src/views/modules/visual/cpts/tb copy 3.vue	
+++ b/src/views/modules/visual/cpts/tb copy 3.vue	
@@ -31,7 +31,7 @@
                          center>
           <template slot-scope="scope">
             <el-radio :label="scope.row.id"
-                      v-model="templateRadio"
+                      v-model.trim="templateRadio"
                       @change.native="getRadioRow(scope.$index,scope.row)">&nbsp;</el-radio>
           </template>
         </el-table-column>
diff --git a/src/views/modules/visual/heart/index.vue b/src/views/modules/visual/heart/index.vue
index 5c0ca936c..ba335c2a5 100644
--- a/src/views/modules/visual/heart/index.vue
+++ b/src/views/modules/visual/heart/index.vue
@@ -3,7 +3,7 @@
     <div class="m-sizer">
       <span>时间：</span>
       <el-date-picker
-        v-model="monthId"
+        v-model.trim="monthId"
         type="month"
         :clearable="false"
         prefix-icon="el-icon-caret-bottom"
diff --git a/src/views/modules/visual/measure/dialogInfo.vue b/src/views/modules/visual/measure/dialogInfo.vue
index 9d604ad8c..b876c022e 100644
--- a/src/views/modules/visual/measure/dialogInfo.vue
+++ b/src/views/modules/visual/measure/dialogInfo.vue
@@ -86,7 +86,7 @@
             <div class="item">
               <span class="item-field item-filed-height ">服务组织：</span>
               <div class="single-select sel-service">
-                <el-select v-model="form.serviceType"
+                <el-select v-model.trim="form.serviceType"
                            class="input-width-small"
                            placeholder="请选择"
                            clearable
@@ -99,7 +99,7 @@
                   </el-option>
                 </el-select>
                 -
-                <el-select v-model="form.serverId"
+                <el-select v-model.trim="form.serverId"
                            class="input-width-middle"
                            filterable
                            placeholder="请选择"
diff --git a/src/views/modules/visual/measure/service.vue b/src/views/modules/visual/measure/service.vue
index f799e6018..64ef78fd1 100644
--- a/src/views/modules/visual/measure/service.vue
+++ b/src/views/modules/visual/measure/service.vue
@@ -6,7 +6,7 @@
         <div class="title-label">
           需求服务分析 &nbsp;&nbsp;
           <el-cascader 
-            v-model="selectAgency"
+            v-model.trim="selectAgency"
             :options="propTree" 
             :props="{ checkStrictly: true }" 
             :show-all-levels="false"
@@ -18,11 +18,11 @@
           <!-- <div class="title-time-label">选择时间</div> -->
           <div class="second-select">
             <!-- <el-date-picker
-              v-model="value2"
+              v-model.trim="value2"
               type="month"
               placeholder="选择月">
             </el-date-picker> -->
-            <el-date-picker v-model="timeRange"
+            <el-date-picker v-model.trim="timeRange"
               type="daterange"
               range-separator="至"
               start-placeholder="开始日期"
diff --git a/src/views/modules/visual/measure/volunteer.vue b/src/views/modules/visual/measure/volunteer.vue
index 755331586..0834956a3 100644
--- a/src/views/modules/visual/measure/volunteer.vue
+++ b/src/views/modules/visual/measure/volunteer.vue
@@ -6,7 +6,7 @@
              src="../../../../assets/img/shuju/title-tip.png" />
         <div class="title-label">
           志愿服务分析&nbsp;&nbsp;
-          <el-cascader v-model="selectAgency"
+          <el-cascader v-model.trim="selectAgency"
                        :options="propTree"
                        :props="{ checkStrictly: true }"
                        :show-all-levels="false"
diff --git a/src/views/modules/visual/plugin/power/organization.vue b/src/views/modules/visual/plugin/power/organization.vue
index 02f2f2cc3..59a7599ec 100644
--- a/src/views/modules/visual/plugin/power/organization.vue
+++ b/src/views/modules/visual/plugin/power/organization.vue
@@ -16,7 +16,7 @@
                          ref="myCascader"
                          placeholder="请选择所属组织"
                          :options="agencytree"
-                         v-model="agencyId"
+                         v-model.trim="agencyId"
                          :show-all-levels="false"
                          @change="handleChangeAgencytree"
                          :props="{ expandTrigger: 'hover', emitPath: false, label: 'orgName', value: 'orgId', children: 'subOrgList' }" />
@@ -24,7 +24,7 @@
         </div>
         <!-- <div class="second-select ">
 
-          <el-date-picker v-model="dateIdShow"
+          <el-date-picker v-model.trim="dateIdShow"
                           type="date"
                           :clearable="false"
                           @change="handleChangeDate"
diff --git a/src/views/modules/visual/shundeju/controlCount.vue b/src/views/modules/visual/shundeju/controlCount.vue
index 0e11821ad..57d116d0e 100644
--- a/src/views/modules/visual/shundeju/controlCount.vue
+++ b/src/views/modules/visual/shundeju/controlCount.vue
@@ -12,7 +12,7 @@
         <div class="title-time new-time">
           <!-- <div class="title-time-label">选择时间</div> -->
           <div class="second-select">
-            <!-- <el-date-picker v-model="timeRange"
+            <!-- <el-date-picker v-model.trim="timeRange"
               type="daterange"
               range-separator="至"
               start-placeholder="开始日期"
@@ -22,7 +22,7 @@
               >
             </el-date-picker> -->
             <el-date-picker
-              v-model="lineTime"
+              v-model.trim="lineTime"
               type="date"
               placeholder="选择日期">
             </el-date-picker>
@@ -38,7 +38,7 @@
         <div class="title-time new-time">
           <!-- <div class="title-time-label">选择时间</div> -->
           <div class="second-select">
-            <el-date-picker v-model="timeRange"
+            <el-date-picker v-model.trim="timeRange"
               type="daterange"
               range-separator="至"
               start-placeholder="开始日期"
diff --git a/src/views/modules/workPc/customer-add-or-update.vue b/src/views/modules/workPc/customer-add-or-update.vue
index 095b0edf9..b236798e1 100644
--- a/src/views/modules/workPc/customer-add-or-update.vue
+++ b/src/views/modules/workPc/customer-add-or-update.vue
@@ -9,10 +9,10 @@
          :style="{height:diaHeight+'px'}">
 
       <el-checkbox :indeterminate="isIndeterminate"
-                   v-model="checkAll"
+                   v-model.trim="checkAll"
                    @change="handleCheckAllChange">全选</el-checkbox>
 
-      <el-checkbox-group v-model="menuListShow"
+      <el-checkbox-group v-model.trim="menuListShow"
                          @change="handleCheckedCitiesChange">
 
         <el-checkbox v-for="(item,index) in customerList "
diff --git a/src/views/modules/workPc/guidance/DetailForm.vue b/src/views/modules/workPc/guidance/DetailForm.vue
index b3f2f50bc..3103e9b8d 100644
--- a/src/views/modules/workPc/guidance/DetailForm.vue
+++ b/src/views/modules/workPc/guidance/DetailForm.vue
@@ -23,7 +23,7 @@
         </div>
 
         <div class="div_editor">
-          <el-tabs v-model="activeName"
+          <el-tabs v-model.trim="activeName"
                    @tab-click="tabClick">
             <el-tab-pane style="height:500px"
                          v-for="(item) in moduleArray"
@@ -35,7 +35,7 @@
                        v-if="formType!='D'"
                        :ref="item.moduleId"
                        :id="item.moduleId"
-                       v-model="item.moduleContent"
+                       v-model.trim="item.moduleContent"
                        :height="450"
                        :customerId="customerId"
                        placeholder="在这里输入文字" />
diff --git a/src/views/modules/workPc/guidance/addForm.vue b/src/views/modules/workPc/guidance/addForm.vue
index 6a011199f..eff0fc49c 100644
--- a/src/views/modules/workPc/guidance/addForm.vue
+++ b/src/views/modules/workPc/guidance/addForm.vue
@@ -24,13 +24,13 @@
         <el-form-item label="标题"
                       prop="title">
           <el-input class="item_width_1"
-                    v-model="dataForm.title"
+                    v-model.trim="dataForm.title"
                     placeholder="标题"></el-input>
         </el-form-item>
         <el-form-item label="分类"
                       prop="categoryCode">
           <el-select class="item_width_1"
-                     v-model="dataForm.categoryCode"
+                     v-model.trim="dataForm.categoryCode"
                      placeholder="请选择">
             <el-option v-for="item in categoryList"
                        :key="item.categoryCode"
@@ -44,7 +44,7 @@
         <el-form-item label="发布单位"
                       prop="orgId">
           <el-select class="item_width_1"
-                     v-model="dataForm.orgId"
+                     v-model.trim="dataForm.orgId"
                      placeholder="请选择">
             <el-option v-for="(item,index) in orgList"
                        @click.native="orgChange(index)"
@@ -58,7 +58,7 @@
       </el-form>
 
       <div class="div_editor">
-        <el-tabs v-model="activeName"
+        <el-tabs v-model.trim="activeName"
                  @tab-click="tabClick">
           <el-tab-pane style="height:500px"
                        v-for="(item) in moduleArray"
@@ -71,7 +71,7 @@
                      v-if="formType!='D'"
                      :ref="item.moduleId"
                      :id="item.moduleId"
-                     v-model="item.moduleContent"
+                     v-model.trim="item.moduleContent"
                      :height="450"
                      :customerId="customerId"
                      placeholder="在这里输入文字" />
@@ -93,13 +93,13 @@
         <el-form-item label="外链地址"
                       prop="externalLink">
           <el-input class="item_width_1"
-                    v-model="externalLink.externalLink"
+                    v-model.trim="externalLink.externalLink"
                     placeholder="外链地址"></el-input>
         </el-form-item>
         <el-form-item label="地址说明"
                       prop="description">
           <el-input class="item_width_1"
-                    v-model="externalLink.description"
+                    v-model.trim="externalLink.description"
                     placeholder="地址说明"></el-input>
         </el-form-item>
         <div>
diff --git a/src/views/modules/workPc/guidance/categoryList.vue b/src/views/modules/workPc/guidance/categoryList.vue
index 7967cb377..84bcd2a72 100644
--- a/src/views/modules/workPc/guidance/categoryList.vue
+++ b/src/views/modules/workPc/guidance/categoryList.vue
@@ -86,7 +86,7 @@
            v-if="diaShow">
            <el-form label-width="100px">
             <el-form-item label="分类名称">
-              <el-input v-model="categoryName" type="textarea"
+              <el-input v-model.trim="categoryName" type="textarea"
                   maxlength="10"
                   :rows="2" style="width: 300px"></el-input>
             </el-form-item>
@@ -96,7 +96,7 @@
                   type="textarea"
                   maxlength="10"
                   :rows="2"
-                  v-model="categoryName"></el-input> -->
+                  v-model.trim="categoryName"></el-input> -->
         <!-- <div class="div_btn">
           <el-button type="primary"
                      size="small"
diff --git a/src/views/modules/workPc/guidance/guidanceList.vue b/src/views/modules/workPc/guidance/guidanceList.vue
index 4a867f916..097d1421c 100644
--- a/src/views/modules/workPc/guidance/guidanceList.vue
+++ b/src/views/modules/workPc/guidance/guidanceList.vue
@@ -8,7 +8,7 @@
           <div>
             <el-form-item label="所属组织"
                           :label-width="labelWidth">
-              <el-cascader v-model="agencyIdArray"
+              <el-cascader v-model.trim="agencyIdArray"
                            style="width:480px"
                            :key="iscascaderShow"
                            :options="options"
@@ -18,7 +18,7 @@
 
             <el-form-item label="问题分类"
                           :label-width="labelWidth">
-              <el-select v-model="tableParams.categoryCode"
+              <el-select v-model.trim="tableParams.categoryCode"
                          placeholder="问题分类"
                          clearable>
                 <el-option v-for="item in categoryList"
@@ -30,7 +30,7 @@
             </el-form-item>
             <el-form-item label="标题"
                           :label-width="labelWidth">
-              <el-input v-model="tableParams.guideTitle"
+              <el-input v-model.trim="tableParams.guideTitle"
                         placeholder="标题"
                         clearable>
 
diff --git a/src/views/modules/workPc/menu-add-or-update.vue b/src/views/modules/workPc/menu-add-or-update.vue
index 42e8b9ce1..88d4ce362 100644
--- a/src/views/modules/workPc/menu-add-or-update.vue
+++ b/src/views/modules/workPc/menu-add-or-update.vue
@@ -2,16 +2,16 @@
   <el-dialog :visible.sync="visible" :title="!dataForm.id ? $t('add') : $t('update')" :close-on-click-modal="false" :close-on-press-escape="false">
     <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" label-width="120px">
       <el-form-item prop="type" :label="$t('menu.type')" size="mini">
-        <el-radio-group v-model="dataForm.type" :disabled="!!dataForm.id">
+        <el-radio-group v-model.trim="dataForm.type" :disabled="!!dataForm.id">
           <el-radio :label="0">{{ $t('menu.type0') }}</el-radio>
           <el-radio :label="1">{{ $t('menu.type1') }}</el-radio>
         </el-radio-group>
       </el-form-item>
       <el-form-item prop="name" :label="$t('menu.name')">
-        <el-input v-model="dataForm.name" :placeholder="$t('menu.name')"></el-input>
+        <el-input v-model.trim="dataForm.name" :placeholder="$t('menu.name')"></el-input>
       </el-form-item>
       <el-form-item prop="parentName" :label="$t('menu.parentName')" class="menu-list">
-        <el-popover v-model="menuListVisible" ref="menuListPopover" placement="bottom-start" trigger="click">
+        <el-popover v-model.trim="menuListVisible" ref="menuListPopover" placement="bottom-start" trigger="click">
           <el-tree
             :data="menuList"
             :props="{ label: 'name', children: 'children' }"
@@ -23,24 +23,24 @@
             @current-change="menuListTreeCurrentChangeHandle">
           </el-tree>
         </el-popover>
-        <el-input v-model="dataForm.parentName" v-popover:menuListPopover :readonly="true" :placeholder="$t('menu.parentName')">
+        <el-input v-model.trim="dataForm.parentName" v-popover:menuListPopover :readonly="true" :placeholder="$t('menu.parentName')">
           <i v-if="dataForm.pid !== '0'" slot="suffix" @click.stop="deptListTreeSetDefaultHandle()" class="el-icon-circle-close el-input__icon"></i>
         </el-input>
       </el-form-item>
       <el-form-item v-if="dataForm.type === 0" prop="url" :label="$t('menu.url')">
-        <el-input v-model="dataForm.url" :placeholder="$t('menu.url')"></el-input>
+        <el-input v-model.trim="dataForm.url" :placeholder="$t('menu.url')"></el-input>
       </el-form-item>
       <el-form-item  prop="showFlag" :label="$t('menu.showFlag')" size="mini">
-        <el-radio-group v-model="dataForm.showFlag">
+        <el-radio-group v-model.trim="dataForm.showFlag">
           <el-radio :label="1">{{ $t('menu.show1') }}</el-radio>
           <el-radio :label="0">{{ $t('menu.show2') }}</el-radio>
         </el-radio-group>
       </el-form-item>
       <el-form-item prop="sort" :label="$t('menu.sort')">
-        <el-input-number v-model="dataForm.sort" controls-position="right" :min="0" :label="$t('menu.sort')"></el-input-number>
+        <el-input-number v-model.trim="dataForm.sort" controls-position="right" :min="0" :label="$t('menu.sort')"></el-input-number>
       </el-form-item>
       <el-form-item v-if="dataForm.type === 0" prop="icon" :label="$t('menu.icon')" class="icon-list">
-        <el-popover v-model="iconListVisible" ref="iconListPopover" placement="bottom-start" trigger="click" popper-class="mod-sys__menu-icon-popover">
+        <el-popover v-model.trim="iconListVisible" ref="iconListPopover" placement="bottom-start" trigger="click" popper-class="mod-sys__menu-icon-popover">
           <div class="mod-sys__menu-icon-inner">
             <div class="mod-sys__menu-icon-list">
               <el-button
@@ -53,10 +53,10 @@
             </div>
           </div>
         </el-popover>
-        <el-input v-model="dataForm.icon" v-popover:iconListPopover :readonly="true" :placeholder="$t('menu.icon')"></el-input>
+        <el-input v-model.trim="dataForm.icon" v-popover:iconListPopover :readonly="true" :placeholder="$t('menu.icon')"></el-input>
       </el-form-item>
       <el-form-item v-if="dataForm.type === 1" prop="permissions" :label="$t('menu.permissions')">
-        <el-input v-model="dataForm.permissions" :placeholder="$t('menu.permissionsTips')"></el-input>
+        <el-input v-model.trim="dataForm.permissions" :placeholder="$t('menu.permissionsTips')"></el-input>
       </el-form-item>
       <el-form-item
         v-for="(item, index) in dataForm.resourceList"
@@ -67,8 +67,8 @@
         class="resource-list">
         <el-row>
           <el-col :span="22">
-            <el-input v-model="item.resourceUrl" :placeholder="$t('menu.resourceUrl')">
-              <el-select v-model="item.resourceMethod" slot="prepend" :placeholder="$t('menu.resourceMethod')">
+            <el-input v-model.trim="item.resourceUrl" :placeholder="$t('menu.resourceUrl')">
+              <el-select v-model.trim="item.resourceMethod" slot="prepend" :placeholder="$t('menu.resourceMethod')">
                 <el-option label="GET" value="GET"></el-option>
                 <el-option label="POST" value="POST"></el-option>
                 <el-option label="PUT" value="PUT"></el-option>
diff --git a/src/views/modules/workSys/dataOpenConfig.vue b/src/views/modules/workSys/dataOpenConfig.vue
index b82fbabad..dafe2362a 100644
--- a/src/views/modules/workSys/dataOpenConfig.vue
+++ b/src/views/modules/workSys/dataOpenConfig.vue
@@ -35,7 +35,7 @@
                          width="350">
           <template slot-scope="scope">
             <el-switch style="margin-left:20px"
-                       v-model="scope.row.stateShow"
+                       v-model.trim="scope.row.stateShow"
                        @change="disableCategory(scope.row,scope.$index)">
             </el-switch>
 
@@ -80,7 +80,7 @@
                         style="display: block">
             <el-cascader class="item_width_1"
                          ref="myCascader"
-                         v-model="orgIdArray"
+                         v-model.trim="orgIdArray"
                          :key="iscascaderShow"
                          :options="casOptions"
                          :props="optionProps"
diff --git a/src/views/modules/workSys/demandCate.vue b/src/views/modules/workSys/demandCate.vue
index 0aae7d810..256ea5cd0 100644
--- a/src/views/modules/workSys/demandCate.vue
+++ b/src/views/modules/workSys/demandCate.vue
@@ -10,7 +10,7 @@
                  class="demo-form-inline">
           <el-form-item label="需求分类">
             <el-select size="small"
-                       v-model="form.firstCategoryCode"
+                       v-model.trim="form.firstCategoryCode"
                        filterable
                        placeholder="请选择"
                        clearable>
@@ -106,17 +106,17 @@
                ref="ruleForm">
         <el-form-item label="分类名称"
                       prop="categoryName">
-          <el-input v-model="form.categoryName"
+          <el-input v-model.trim="form.categoryName"
                     size="small"
                     style="width: 180px;"></el-input>
         </el-form-item>
 
         <!-- <el-form-item label="状态">
-          <el-switch v-model="form.usableFlag"></el-switch>
+          <el-switch v-model.trim="form.usableFlag"></el-switch>
         </el-form-item> -->
         <el-form-item v-if="addLevel == '2'"
                       label="奖励积分">
-          <el-input-number v-model="form.awardPoint"
+          <el-input-number v-model.trim="form.awardPoint"
                            :min="0"
                            size="small"
                            label="描述文字"></el-input-number>
diff --git a/src/views/modules/workSys/elegantEdit.vue b/src/views/modules/workSys/elegantEdit.vue
index 702a9d5b1..ef0ce79b5 100644
--- a/src/views/modules/workSys/elegantEdit.vue
+++ b/src/views/modules/workSys/elegantEdit.vue
@@ -21,13 +21,13 @@
             <el-input class="item_width_1"
                       :maxlength="10"
                       :minlength="1"
-                      v-model="dataForm.categoryName"
+                      v-model.trim="dataForm.categoryName"
                       placeholder="分类名称"></el-input>
           </el-tooltip>
         </el-form-item>
         <!-- <el-form-item label="排序"
                       prop="sort">
-          <el-input-number v-model="dataForm.sort"
+          <el-input-number v-model.trim="dataForm.sort"
                            :min="1"
                            label="描述文字"></el-input-number>
         </el-form-item> -->
diff --git a/src/views/modules/workSys/hobbyItemsComponents/addForm.vue b/src/views/modules/workSys/hobbyItemsComponents/addForm.vue
index 0821ac38e..26d12f5ca 100644
--- a/src/views/modules/workSys/hobbyItemsComponents/addForm.vue
+++ b/src/views/modules/workSys/hobbyItemsComponents/addForm.vue
@@ -18,7 +18,7 @@
       >
         <el-form-item label="分类名称" prop="categoryName">
           <el-input
-            v-model="formData.categoryName"
+            v-model.trim="formData.categoryName"
             class="u-item-width-normal"
             size="small"
             clearable
@@ -27,14 +27,14 @@
         </el-form-item>
 
         <!-- <el-form-item label="奖励积分" prop="awardPoint">
-					<el-input-number v-model="formData.awardPoint" class="u-item-width-normal" size="small" clearable placeholder="请输入"></el-input-number>
+					<el-input-number v-model.trim="formData.awardPoint" class="u-item-width-normal" size="small" clearable placeholder="请输入"></el-input-number>
 				</el-form-item> -->
         <el-form-item label="对应个性需求" prop="demandList">
           <el-cascader
             ref="cascaderItem1"
             :options="demandOptions"
             :props="props1"
-            v-model="formData.demandList1"
+            v-model.trim="formData.demandList1"
             @change="handleAreaChange1"
             clearable
           ></el-cascader>
@@ -44,7 +44,7 @@
             ref="cascaderItem2"
             :options="commonServiceTypeOptions"
             :props="props2"
-            v-model="formData.commonServiceTypeList1"
+            v-model.trim="formData.commonServiceTypeList1"
             @change="handleAreaChange2"
             clearable
           ></el-cascader>
diff --git a/src/views/modules/workSys/mapConfig.vue b/src/views/modules/workSys/mapConfig.vue
index b4d8e1fa9..05e68a8a6 100644
--- a/src/views/modules/workSys/mapConfig.vue
+++ b/src/views/modules/workSys/mapConfig.vue
@@ -2,7 +2,7 @@
     <div>
         <div style="position: relative">
             <div class="m-search">
-                <el-select v-model="selAgencyId"
+                <el-select v-model.trim="selAgencyId"
                            size="small"
                            placeholder="请选择或点击区域选择">
                     <el-option @click.native="orgChange(index)"
@@ -52,7 +52,7 @@
                                      :precision="5"
                                      :step="0.0001"
                                      placeholder="请输入经度偏差"
-                                     v-model="xOffset">
+                                     v-model.trim="xOffset">
                     </el-input-number>
                     <span v-if="showBtn && hasPolygon"> 纬度偏差：</span>
                     <el-input-number v-if="showBtn && hasPolygon"
@@ -62,7 +62,7 @@
                                      :step="0.0001"
                                      style="width: 200px"
                                      placeholder="请输入维度偏差"
-                                     v-model="yOffset">
+                                     v-model.trim="yOffset">
                     </el-input-number>
 
                     <el-button v-if="showBtn && hasPolygon"
@@ -102,12 +102,12 @@
                     <span> 中心点经度：</span>
                     <el-input-number size="small"
                                      style="width: 250px"
-                                     v-model="longitude">
+                                     v-model.trim="longitude">
                     </el-input-number>
                     <span style="margin-left: 15px"> 中心点纬度：</span>
                     <el-input-number size="small"
                                      style="width: 250px"
-                                     v-model="latitude">
+                                     v-model.trim="latitude">
                     </el-input-number>
                 </div>
                 <div style="margin-top: 20px">
@@ -115,7 +115,7 @@
                               :rows="15"
                               style="width: 600px; max-height: 500px"
                               placeholder="请复制坐标数据"
-                              v-model="polygonManullyString">
+                              v-model.trim="polygonManullyString">
                     </el-input>
                 </div>
                 <div style="margin-top: 20px">
@@ -126,7 +126,7 @@
                                      :precision="5"
                                      :step="0.0001"
                                      placeholder="请输入经度偏差"
-                                     v-model="xOffset_customize">
+                                     v-model.trim="xOffset_customize">
                     </el-input-number>
                     <span style="margin-left: 15px"> 纬度偏差：</span>
                     <el-input-number resize="none"
@@ -135,7 +135,7 @@
                                      :step="0.0001"
                                      style="width: 200px"
                                      placeholder="请输入维度偏差"
-                                     v-model="yOffset_customize">
+                                     v-model.trim="yOffset_customize">
                     </el-input-number>
                 </div>
             </div>
diff --git a/src/views/modules/workSys/operAuth.vue b/src/views/modules/workSys/operAuth.vue
index c77fb9339..58bf42372 100644
--- a/src/views/modules/workSys/operAuth.vue
+++ b/src/views/modules/workSys/operAuth.vue
@@ -10,7 +10,7 @@
           <el-form-item label="操作时间"
                         label-width="110px"
                         prop="startTime">
-            <el-date-picker v-model="timeRange"
+            <el-date-picker v-model.trim="timeRange"
                             size="small"
                             type="datetimerange"
                             @change="handleTimeChange"
@@ -25,7 +25,7 @@
 
           <el-form-item label="姓名"
                         prop="operatorName">
-            <el-input v-model="formData.operatorName"
+            <el-input v-model.trim="formData.operatorName"
                       size="small"
                       class="list_item_width_1"
                       clearable
@@ -36,7 +36,7 @@
 
           <el-form-item label="联系电话"
                         prop="operatorMobile">
-            <el-input v-model="formData.operatorMobile"
+            <el-input v-model.trim="formData.operatorMobile"
                       size="small"
                       class="list_item_width_1"
                       clearable
diff --git a/src/views/modules/workSys/pointAditive/rule.vue b/src/views/modules/workSys/pointAditive/rule.vue
index cd3566d5c..da55094c4 100644
--- a/src/views/modules/workSys/pointAditive/rule.vue
+++ b/src/views/modules/workSys/pointAditive/rule.vue
@@ -63,7 +63,7 @@
         <el-form-item label="上级分类"
                       prop="pid">
           <el-select class="item_width_1"
-                      v-model="form.pid"
+                      v-model.trim="form.pid"
                       placeholder="请选择"
                       size="small"
                       :disabled="addLevel == '2' || addLevel == '3' || addLevel == '4' || addLevel == '5'? true : false"
@@ -78,20 +78,20 @@
         </el-form-item>
         <el-form-item label="类别名称"
                       prop="categoryName">
-          <el-input :disabled="addLevel == '3' || addLevel == '5' || editFlag ==='0'? true : false" v-model="form.categoryName"
+          <el-input :disabled="addLevel == '3' || addLevel == '5' || editFlag ==='0'? true : false" v-model.trim="form.categoryName"
                     size="small"
                     style="width: 180px;"></el-input>
         </el-form-item>
         <el-form-item v-if="(addLevel == '3'  || addLevel == '5') && editFlag ==='1'" label="规则名称"
                       prop="ruleName">
-          <el-input v-model="form.ruleName"
+          <el-input v-model.trim="form.ruleName"
                     size="small"
                     style="width: 180px;"></el-input>
         </el-form-item>
         <el-form-item v-if="addLevel == '3' || addLevel == '5'"
                       label="加减分值"
                       prop="pointValue">
-          <el-input-number v-model="form.pointValue"
+          <el-input-number v-model.trim="form.pointValue"
                            size="small"
                            label="描述文字"></el-input-number>
           (减分请输入负数)
@@ -100,8 +100,8 @@
                       label="居民端积分申请"
                       prop="applyFlag"
                       label-width="140px">
-            <el-radio v-model="form.applyFlag" label="0" :disabled="editFlag=='0'">允许申请</el-radio>
-            <el-radio v-model="form.applyFlag" label="1" :disabled="editFlag=='0'">不允许申请</el-radio>
+            <el-radio v-model.trim="form.applyFlag" label="0" :disabled="editFlag=='0'">允许申请</el-radio>
+            <el-radio v-model.trim="form.applyFlag" label="1" :disabled="editFlag=='0'">不允许申请</el-radio>
         </el-form-item>
       </el-form>
       <div class="resi-btns">
diff --git a/src/views/modules/workSys/resiCate.vue b/src/views/modules/workSys/resiCate.vue
index 0f937658e..16113a484 100644
--- a/src/views/modules/workSys/resiCate.vue
+++ b/src/views/modules/workSys/resiCate.vue
@@ -9,7 +9,7 @@
                  :model="form"
                  class="demo-form-inline">
           <el-form-item label="是否预警">
-            <el-select v-model="isWarn"
+            <el-select v-model.trim="isWarn"
                        placeholder="请选择"
                        size="small"
                        clearable>
@@ -21,7 +21,7 @@
             </el-select>
           </el-form-item>
           <el-form-item label="预警类型">
-            <el-select v-model="level"
+            <el-select v-model.trim="level"
                        placeholder="请选择"
                        size="small"
                        clearable>
@@ -117,7 +117,7 @@
                ref="ruleForm"
                class="dialog-h-content scroll-h">
         <el-form-item label="类别名称">
-          <el-input v-model="form.label"
+          <el-input v-model.trim="form.label"
                     size="small"
                     style="width: 180px;"
                     disabled></el-input>
@@ -171,17 +171,17 @@
           </el-upload>
         </el-form-item>
         <el-form-item label="是否预警">
-          <el-switch v-model="form.warn"></el-switch>
+          <el-switch v-model.trim="form.warn"></el-switch>
         </el-form-item>
         <el-form-item label="黄色预警">
-          <el-input-number v-model="form.level1"
+          <el-input-number v-model.trim="form.level1"
                            :min="0"
                            size="small"
                            label="描述文字"
                            @change="handleLevelChange"></el-input-number> 人楼栋
         </el-form-item>
         <el-form-item label="红色预警">
-          <el-input-number v-model="form.level2"
+          <el-input-number v-model.trim="form.level2"
                            :min="form.level1"
                            size="small"
                            label="描述文字"></el-input-number> 人/楼栋
@@ -189,19 +189,19 @@
 
         <el-form-item v-if="form.columnName==='IS_YLFN'"
                       label="自动匹配">
-          <el-switch v-model="autoMatching"></el-switch>
+          <el-switch v-model.trim="autoMatching"></el-switch>
         </el-form-item>
 
         <el-form-item v-if="form.columnName==='IS_YLFN' && autoMatching"
                       label="匹配规则">
           <span>年龄：</span>
-          <el-input-number v-model="ageMin"
+          <el-input-number v-model.trim="ageMin"
                            :min="0"
                            size="small"
                            label="描述文字"></el-input-number>
 
           <span>{{' — '}}</span>
-          <el-input-number v-model="ageMax"
+          <el-input-number v-model.trim="ageMax"
                            :min="ageMin"
                            size="small"
                            label="描述文字"></el-input-number>
diff --git a/src/views/modules/workSys/residentCategory.vue b/src/views/modules/workSys/residentCategory.vue
index 694044f7e..4f95edde9 100644
--- a/src/views/modules/workSys/residentCategory.vue
+++ b/src/views/modules/workSys/residentCategory.vue
@@ -5,12 +5,12 @@
 				<el-form :inline="true" :model="formData" ref="ref_searchform" :label-width="'100px'">
 					<div>
 						<el-form-item label="预警" prop="warnFlag">
-							<el-select class="u-item-width-normal" v-model="formData.warnFlag" placeholder="全部" size="small" clearable>
+							<el-select class="u-item-width-normal" v-model.trim="formData.warnFlag" placeholder="全部" size="small" clearable>
 								<el-option v-for="item in warnFlagList" :key="item.value" :label="item.label" :value="item.value"></el-option>
 							</el-select>
 						</el-form-item>
 						<el-form-item label="智能分类" prop="intelligentFlag">
-							<el-select class="u-item-width-normal" v-model="formData.intelligentFlag" placeholder="全部" size="small" clearable>
+							<el-select class="u-item-width-normal" v-model.trim="formData.intelligentFlag" placeholder="全部" size="small" clearable>
 								<el-option v-for="item in intelligentFlagList" :key="item.value" :label="item.label" :value="item.value"></el-option>
 							</el-select>
 						</el-form-item>
diff --git a/src/views/modules/workSys/residentCategoryComponents/addForm.vue b/src/views/modules/workSys/residentCategoryComponents/addForm.vue
index abeaa082c..99986152d 100644
--- a/src/views/modules/workSys/residentCategoryComponents/addForm.vue
+++ b/src/views/modules/workSys/residentCategoryComponents/addForm.vue
@@ -8,33 +8,33 @@
 		<div>
 			<el-form :model="formData" ref="form" :rules="dataRule" :label-width="'120px'">
 				<el-form-item label="类别名称" prop="categoryName">
-					<el-input v-model="formData.categoryName" disabled class="u-item-width-normal" size="small" clearable placeholder="请输入"></el-input>
+					<el-input v-model.trim="formData.categoryName" disabled class="u-item-width-normal" size="small" clearable placeholder="请输入"></el-input>
 				</el-form-item>
-				<el-form-item label="是否预警" prop="warnFlag"><el-switch v-model="formData.warnFlag" :active-value="1" :inactive-value="0"></el-switch></el-form-item>
+				<el-form-item label="是否预警" prop="warnFlag"><el-switch v-model.trim="formData.warnFlag" :active-value="1" :inactive-value="0"></el-switch></el-form-item>
 				<el-form-item label="黄色预警" prop="yellowThreshold">
-					<el-input-number v-model="formData.yellowThreshold" class="u-item-width-normal" size="small" clearable placeholder="请输入"></el-input-number>
+					<el-input-number v-model.trim="formData.yellowThreshold" class="u-item-width-normal" size="small" clearable placeholder="请输入"></el-input-number>
 					人楼栋
 				</el-form-item>
 				<el-form-item label="红色预警" prop="redThreshold">
-					<el-input-number v-model="formData.redThreshold" class="u-item-width-normal" size="small" clearable placeholder="请输入"></el-input-number>
+					<el-input-number v-model.trim="formData.redThreshold" class="u-item-width-normal" size="small" clearable placeholder="请输入"></el-input-number>
 					人楼栋
 				</el-form-item>
 				<div v-if="index != -1">
-					<el-form-item label="智能分类" prop="intelligentFlag"><el-switch v-model="formData.intelligentFlag" :active-value="1" :inactive-value="0"></el-switch></el-form-item>
+					<el-form-item label="智能分类" prop="intelligentFlag"><el-switch v-model.trim="formData.intelligentFlag" :active-value="1" :inactive-value="0"></el-switch></el-form-item>
 					<el-form-item label="默认规则" prop="defaultRule">{{ formData.defaultRule }}</el-form-item>
 					<el-form-item label="婚姻状况" prop="maritalStatus" v-if="index == 0">
-						<el-select class="u-item-width-normal" v-model="formData.maritalStatus" placeholder="全部" size="small" clearable>
+						<el-select class="u-item-width-normal" v-model.trim="formData.maritalStatus" placeholder="全部" size="small" clearable>
 							<el-option v-for="item in marryList" :key="item.value" :label="item.label" :value="item.value"></el-option>
 						</el-select>
 					</el-form-item>
 					<el-form-item label="年龄" prop="age" v-if="index == 0">
-						<el-input-number v-model="formData.lowerAge" class="u-item-width-normal" size="small" clearable placeholder="请输入"></el-input-number>
+						<el-input-number v-model.trim="formData.lowerAge" class="u-item-width-normal" size="small" clearable placeholder="请输入"></el-input-number>
 						(含)-
-						<el-input-number v-model="formData.upperAge" class="u-item-width-normal" size="small" clearable placeholder="请输入"></el-input-number>
+						<el-input-number v-model.trim="formData.upperAge" class="u-item-width-normal" size="small" clearable placeholder="请输入"></el-input-number>
 						(含)
 					</el-form-item>
 					<el-form-item label="年龄" prop="age" v-if="index == 1 || index == 2 || index == 3">
-						<el-input-number v-model="formData.lowerAge" class="u-item-width-normal" size="small" clearable placeholder="请输入"></el-input-number>
+						<el-input-number v-model.trim="formData.lowerAge" class="u-item-width-normal" size="small" clearable placeholder="请输入"></el-input-number>
 						以上(含)
 					</el-form-item>
 				</div>
diff --git a/src/views/modules/workSys/role/role.vue b/src/views/modules/workSys/role/role.vue
index fe5188b8d..f00869619 100644
--- a/src/views/modules/workSys/role/role.vue
+++ b/src/views/modules/workSys/role/role.vue
@@ -8,7 +8,7 @@
 
         <el-form-item label="角色名称"
                       prop="name">
-          <el-input v-model="formData.name"
+          <el-input v-model.trim="formData.name"
                     size="small"
                     class="list_item_width_1"
                     clearable
@@ -19,7 +19,7 @@
         <!-- <el-form-item label="创建时间"
                       label-width="110px"
                       prop="createdTime">
-          <el-date-picker v-model="formData.createdTime"
+          <el-date-picker v-model.trim="formData.createdTime"
                           size="small"
                           type="datetime"
                           @change="handleTimeChange"
diff --git a/src/views/modules/workSys/role/roleForm.vue b/src/views/modules/workSys/role/roleForm.vue
index 8b21186db..bb2cd048c 100644
--- a/src/views/modules/workSys/role/roleForm.vue
+++ b/src/views/modules/workSys/role/roleForm.vue
@@ -17,7 +17,7 @@
                     :disabled="defaultRole==='1'"
                     placeholder="请输入角色名称"
                     clearable
-                    v-model="formData.name">
+                    v-model.trim="formData.name">
           </el-input>
 
         </el-form-item>
@@ -34,7 +34,7 @@
                     :autosize="{ minRows: 5, maxRows: 10 }"
                     clearable
                     placeholder="请输入备注"
-                    v-model="formData.remark"></el-input>
+                    v-model.trim="formData.remark"></el-input>
         </el-form-item>
 
         <el-form-item label="管理平台菜单"
diff --git a/src/views/modules/workSys/serviceMattersComponents/addForm.vue b/src/views/modules/workSys/serviceMattersComponents/addForm.vue
index fdc7a336a..39e681a2e 100644
--- a/src/views/modules/workSys/serviceMattersComponents/addForm.vue
+++ b/src/views/modules/workSys/serviceMattersComponents/addForm.vue
@@ -18,7 +18,7 @@
       >
         <el-form-item label="一级分类" prop="categoryName" v-if="levelFlag || pageType == 'add'">
           <el-autocomplete
-            v-model="formData.categoryName"
+            v-model.trim="formData.categoryName"
             class="u-item-width-normal"
             size="small"
             clearable
@@ -29,7 +29,7 @@
         </el-form-item>
         <el-form-item label="二级分类" prop="categoryChildName" v-if="!levelFlag || pageType == 'add'">
           <el-input
-            v-model="formData.categoryChildName"
+            v-model.trim="formData.categoryChildName"
             class="u-item-width-normal"
             size="small"
             clearable
@@ -38,14 +38,14 @@
         </el-form-item>
 
         <!-- <el-form-item label="奖励积分" prop="awardPoint">
-					<el-input-number v-model="formData.awardPoint" class="u-item-width-normal" size="small" clearable placeholder="请输入"></el-input-number>
+					<el-input-number v-model.trim="formData.awardPoint" class="u-item-width-normal" size="small" clearable placeholder="请输入"></el-input-number>
 				</el-form-item> -->
         <!-- <el-form-item label="对应个性需求" prop="demandList">
           <el-cascader
             ref="cascaderItem1"
             :options="demandOptions"
             :props="props1"
-            v-model="formData.demandList1"
+            v-model.trim="formData.demandList1"
             @change="handleAreaChange1"
             clearable
           ></el-cascader>
@@ -55,7 +55,7 @@
             ref="cascaderItem2"
             :options="commonServiceTypeOptions"
             :props="props2"
-            v-model="formData.commonServiceTypeList1"
+            v-model.trim="formData.commonServiceTypeList1"
             @change="handleAreaChange2"
             clearable
           ></el-cascader>
diff --git a/src/views/modules/workSys/setResiUpdate/index.vue b/src/views/modules/workSys/setResiUpdate/index.vue
new file mode 100644
index 000000000..c04ba30f2
--- /dev/null
+++ b/src/views/modules/workSys/setResiUpdate/index.vue
@@ -0,0 +1,211 @@
+<template>
+  <div class="g-main">
+    <div>
+      <div class="m-table">
+        <div class="div_btn_left">
+          <el-button size="small" type="primary" @click="submit"
+            >保存设置</el-button
+          >
+          <el-button style="margin-left: 10px" size="small" @click="resetSearch"
+            >重置</el-button
+          >
+        </div>
+        <el-table
+          :data="tableData"
+          border
+          v-loading="tableLoading"
+          class="m-table-item"
+          style="width: 100%"
+          :height="maxTableHeight"
+        >
+          <el-table-column
+            prop="residentCategoryName"
+            align="center"
+            label="居民分类"
+            :show-overflow-tooltip="true"
+          >
+          </el-table-column>
+          <el-table-column
+            align="center"
+            label="更新周期"
+            :show-overflow-tooltip="true"
+          >
+            <template slot-scope="scope">
+              <el-select
+                v-model.trim="scope.row.updatePeriod"
+                clearable
+                placeholder="请选择"
+              >
+                <el-option
+                  v-for="item in updatePeriodOptions"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+                ></el-option>
+              </el-select>
+            </template>
+          </el-table-column>
+          <!--  -->
+          <el-table-column
+            prop="staffId"
+            align="center"
+            label="更新负责人"
+            :show-overflow-tooltip="true"
+          >
+            <template slot-scope="scope">
+              <el-select
+                v-model.trim="scope.row.userId"
+                placeholder="请选择"
+                clearable
+              >
+                <el-option
+                  v-for="item in dicts.stafflist"
+                  :key="item.value"
+                  :label="item.roleStr"
+                  :value="item.staffId"
+                ></el-option>
+              </el-select>
+            </template>
+          </el-table-column>
+        </el-table>
+      </div>
+    </div>
+  </div>
+</template>
+    
+      <script>
+import { requestPost } from "@/js/dai/request";
+import nextTick from "dai-js/tools/nextTick";
+import { mapGetters } from "vuex";
+
+export default {
+  components: {},
+  data() {
+    return {
+      tableLoading: false,
+      user: {},
+      tableData: [],
+      updatePeriodOptions: [
+        {
+          label: "每周",
+          value: "week",
+        },
+        {
+          label: "每半自然月",
+          value: "halfMonth",
+        },
+        {
+          label: "每自然月",
+          value: "month",
+        },
+      ],
+      dicts: {
+        stafflist: [],
+      }, //字典对象
+    };
+  },
+  computed: {
+    maxTableHeight() {
+      const h = this.clientHeight - 250 + this.iframeHeight;
+      const _h = this.clientHeight - 250;
+      return this.$store.state.inIframe ? h : _h;
+    },
+    ...mapGetters(["clientHeight", "iframeHeight"]),
+  },
+  watch: {},
+  created() {},
+  mounted() {
+    this.user = this.$store.state.user;
+    this.agencyId = this.user.agencyId;
+    this.getStafflist();
+    this.getTableData();
+  },
+  methods: {
+    // --------------------------------------字典------------------------------------------
+    getStafflist() {
+      let parms = {
+        orgId: this.user.agencyId,
+        orgType: "agency",
+        pageNo: 1,
+        pageSize: 100,
+      };
+      this.$http.post("data/aggregator/org/stafflist", parms).then((resp) => {
+        this.dicts.stafflist = resp.data.data.staffList;
+        console.log("stafflist", resp.data);
+      });
+    },
+    // ------------------------------------事件------------------------------------------
+
+    //   获取列表
+    async getTableData() {
+      this.tableLoading = true;
+      const url = "/actual/base/residentCategoryUpdateInfo/upadteSettingList";
+
+      const { data, code, msg } = await requestPost(url, {
+        orgId: this.user.agencyId,
+        orgType: this.user.level,
+        pageNo: 1,
+        pageSize: 1000,
+      });
+      this.tableLoading = false;
+      if (code === 0) {
+        this.tableData = data;
+      } else {
+        this.$message.error(msg);
+      }
+    },
+    async submit() {
+      let url = "/actual/base/residentCategoryUpdateInfo/updateList";
+      let params = this.tableData.map((item) => {
+        return {
+          id: item.id,
+          updatePeriod: item.updatePeriod,
+          userId: item.userId,
+        };
+      });
+      const { data, code, msg } = await requestPost(url, params);
+      if (code === 0) {
+        this.$message.success("操作成功");
+        this.getTableData();
+      } else {
+        this.$message.error(msg);
+      }
+    },
+    //   重置
+    resetSearch() {
+      this.$confirm("重置之后无法恢复，确认重置？", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+          this.tableData = this.tableData.map((item) => {
+            return {
+              ...item,
+              updatePeriod: '',
+              userId: '',
+            };
+          });
+          this.submit();
+          this.getTableData();
+        })
+        .catch((err) => {
+          console.error(err);
+          //   this.$message.error("删除失败");
+        });
+    },
+  },
+
+  props: {},
+};
+</script>
+  <style lang="scss" scoped>
+@import "@/assets/scss/buttonstyle.scss";
+@import "@/assets/scss/modules/management/list-main.scss";
+@import "@/assets/scss/modules/shequzhili/event-info.scss";
+.div_btn_left > * {
+  margin-right: 10px;
+}
+</style>
+    
+    
\ No newline at end of file
diff --git a/src/views/modules/workSys/workLog/edit.vue b/src/views/modules/workSys/workLog/edit.vue
index 59311cbae..0767f4e73 100644
--- a/src/views/modules/workSys/workLog/edit.vue
+++ b/src/views/modules/workSys/workLog/edit.vue
@@ -21,13 +21,13 @@
             <el-input class="item_width_1"
                       :maxlength="10"
                       :minlength="1"
-                      v-model="dataForm.serviceTypeName"
+                      v-model.trim="dataForm.serviceTypeName"
                       placeholder="分类名称"></el-input>
           </el-tooltip>
         </el-form-item>
         <!-- <el-form-item label="排序"
                       prop="sort">
-          <el-input-number v-model="dataForm.sort"
+          <el-input-number v-model.trim="dataForm.sort"
                            :min="1"
                            label="描述文字"></el-input-number>
         </el-form-item> -->
diff --git a/src/views/modules/worklog/icworklog-add-or-update.vue b/src/views/modules/worklog/icworklog-add-or-update.vue
index b426a9129..625774ead 100644
--- a/src/views/modules/worklog/icworklog-add-or-update.vue
+++ b/src/views/modules/worklog/icworklog-add-or-update.vue
@@ -32,11 +32,11 @@
         </el-select>
       </el-form-item>
       <el-form-item label="标题" prop="title">
-        <el-input v-model="dataForm.title" placeholder="标题"></el-input>
+        <el-input v-model.trim="dataForm.title" placeholder="标题"></el-input>
       </el-form-item>
       <el-form-item label="日志类型" prop="logType">
         <el-select
-          v-model="dataForm.logType"
+          v-model.trim="dataForm.logType"
           placeholder="请选择"
           size="small"
           clearable
@@ -52,7 +52,7 @@
       </el-form-item>
       <el-form-item label="日志时间" prop="logDate">
         <el-date-picker
-          v-model="dataForm.logDate"
+          v-model.trim="dataForm.logDate"
           format="yyyy-MM-dd"
           value-format="yyyy-MM-dd"
           type="date"
@@ -64,14 +64,14 @@
         <el-input
           type="textarea"
           :autosize="{ minRows: 3, maxRows: 5 }"
-          v-model="dataForm.content"
+          v-model.trim="dataForm.content"
           placeholder="内容"
         ></el-input>
       </el-form-item>
       <el-form-item label="备注" prop="remark">
         <el-input
           type="textarea"
-          v-model="dataForm.remark"
+          v-model.trim="dataForm.remark"
           placeholder="备注"
         ></el-input>
       </el-form-item>
diff --git a/src/views/modules/worklog/icworklog.vue b/src/views/modules/worklog/icworklog.vue
index aaf015dd7..7ba35626a 100644
--- a/src/views/modules/worklog/icworklog.vue
+++ b/src/views/modules/worklog/icworklog.vue
@@ -14,7 +14,7 @@
                            size="small"
                            ref="myCascader"
                            clearable
-                           v-model="agencyIdArray"
+                           v-model.trim="agencyIdArray"
                            :options="orgOptions"
                            :props="orgOptionProps"
                            :show-all-levels="false"
@@ -23,7 +23,7 @@
           </el-form-item>
           <el-form-item label="日志类型"
                         prop="logType">
-            <el-select v-model="dataForm.logType"
+            <el-select v-model.trim="dataForm.logType"
                        placeholder="请选择"
                        size="small"
                        clearable>
@@ -36,7 +36,7 @@
           </el-form-item>
           <el-form-item label="网格员"
                         prop="createdUser">
-            <el-input v-model="dataForm.createdUser"
+            <el-input v-model.trim="dataForm.createdUser"
                       size="small"
                       clearable
                       placeholder="请输入网格员姓名">
@@ -44,7 +44,7 @@
           </el-form-item>
           <el-form-item label="联系电话"
                         prop="createdUser">
-            <el-input v-model="dataForm.mobile"
+            <el-input v-model.trim="dataForm.mobile"
                       size="small"
                       clearable
                       placeholder="请输入联系电话">
@@ -52,7 +52,7 @@
           </el-form-item>
           <el-form-item label="日志时间"
                         prop="startTime">
-            <el-date-picker v-model="dataForm.startTime"
+            <el-date-picker v-model.trim="dataForm.startTime"
                             type="date"
                             size="small"
                             :picker-options="pickerBeginDateBefore"
@@ -64,7 +64,7 @@
           </el-form-item>
           <el-form-item label="至"
                         prop="endTime">
-            <el-date-picker v-model="dataForm.endTime"
+            <el-date-picker v-model.trim="dataForm.endTime"
                             type="date"
                             size="small"
                             :picker-options="pickerBeginDateAfter"
diff --git a/src/views/pages/login.vue b/src/views/pages/login.vue
index f81d7aaf0..b317552bd 100644
--- a/src/views/pages/login.vue
+++ b/src/views/pages/login.vue
@@ -18,7 +18,7 @@
               <el-form-item prop="phone" class="input">
                 <el-input
                   type="text"
-                  v-model="dataForm.phone"
+                  v-model.trim="dataForm.phone"
                   placeholder="账号"
                 >
                 <template slot='suffix'>
@@ -32,7 +32,7 @@
               <el-form-item prop="password" class="input">
                 <el-input
                   type="password"
-                  v-model="dataForm.password"
+                  v-model.trim="dataForm.password"
                   :placeholder="$t('login.password')"
                >
                <template slot='suffix'>
@@ -48,7 +48,7 @@
                 <el-form-item prop="captcha" class="input">
                   <el-input
                     type="text"
-                    v-model="dataForm.captcha"
+                    v-model.trim="dataForm.captcha"
                     placeholder="验证码"
                   > 
                   <template slot='suffix'>
@@ -277,7 +277,6 @@ export default {
           this.diaVisible = false;
 
           localStorage.setItem("userType", "work");
-
           localStorage.setItem("token", res.data.token);
           this.skipAfterLogin();
         })
diff --git a/vue.config.js b/vue.config.js
index fa6a9a897..d8dc2c0d7 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -35,8 +35,8 @@ module.exports = {
         target: "http://bipaas.elinkservice.cn", // 我们要代理的真实接口地址
       },
       "/api": {
-        // target: "http://219.146.91.110:30801", // 测试地址
-        target: "http://localhost:8080", // 本地地址
+        target: "http://219.146.91.110:30801", // 测试地址
+        // target: "http://192.168.1.60:8080", // 本地地址
         // target: "https://epmet-preview.elinkservice.cn", // 演示地址
         changeOrigin: true,
         pathRewrite: {