From 09871bc5bdfeae3e8350ed4ced8c7060b25e6f95 Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Thu, 18 Aug 2022 16:25:06 +0800
Subject: [PATCH 1/2] BUG 30927

---
 src/project/saas/AppResidentDocument/Tags.vue | 195 +++++++++---------
 1 file changed, 100 insertions(+), 95 deletions(-)

diff --git a/src/project/saas/AppResidentDocument/Tags.vue b/src/project/saas/AppResidentDocument/Tags.vue
index bc7f5469..7ab0e74b 100644
--- a/src/project/saas/AppResidentDocument/Tags.vue
+++ b/src/project/saas/AppResidentDocument/Tags.vue
@@ -4,10 +4,10 @@
       <h2>标签列表</h2>
       <div class="tags-list">
         <div class="item"
-          v-for="(item, index) in list"
-          :class="[checked.includes(item.id) ? 'active' : '']"
-          :key="index"
-          @click="onClick(item.id)">
+             v-for="(item, index) in list"
+             :class="[checked.includes(item.id) ? 'active' : '']"
+             :key="index"
+             @click="onClick(item.id)">
           {{ item.labelName }}
         </div>
       </div>
@@ -19,121 +19,126 @@
 </template>
 
 <script>
-  export default {
-    appName: '居民标签',
+export default {
+  appName: '居民标签',
 
-    data () {
-      return {
-        currIndex: 0,
-        list: [],
-        checked: []
+  data() {
+    return {
+      currIndex: 0,
+      list: [],
+      checked: []
+    }
+  },
+
+  onLoad(query) {
+    this.getList()
+
+    if (query.ids) {
+      this.checked = query.ids.split(',')
+    }
+  },
+
+  methods: {
+    getList() {
+      this.$loading()
+      this.$http.post('/app/appresidentlabelinfo/list?size=1000').then((res) => {
+        if (res.code == 0) {
+          this.list = res.data.records
+        }
+      })
+    },
+
+    onClick(id) {
+      const index = this.checked.indexOf(id)
+
+      if (index === -1) {
+        this.checked.push(id)
+      } else {
+        this.checked.splice(index, 1)
       }
     },
 
-    onLoad (query) {
-      this.getList()
-
-      if (query.ids) {
-        this.checked = query.ids.split(',')
+    submit() {
+      if (!this.checked.length) {
+        return this.$u.toast('请选择标签')
       }
-    },
 
-    methods: {
-      getList() {
-        this.$loading()
-        this.$http.post('/app/appresidentlabelinfo/list?size=1000').then((res) => {
-          if (res.code == 0) {
-            this.list = res.data.records
-          }
-        })
-      },
+      const list = this.list.filter(v => {
+        return this.checked.includes(v.id)
+      })
 
-      onClick (id) {
-        const index = this.checked.indexOf(id)
+      uni.$emit('onChecked', list)
 
-        if (index === -1) {
-          this.checked.push(id)
-        } else {
-          this.checked.splice(index, 1)
-        }
-      },
-
-      submit () {
-        if (!this.checked.length) {
-          return this.$u.toast('请选择标签')
-        }
-
-        const list = this.list.filter(v => {
-          return this.checked.includes(v.id)
-        })
-
-        uni.$emit('onChecked', list)
-
-        uni.navigateBack()
-      }
+      uni.navigateBack()
     }
   }
+}
 </script>
 
 <style lang="scss" scoped>
-  .tags {
-    padding: 16px 0 130px;
+.tags {
+  padding: 16px 0 130px;
 
-    * {
-      box-sizing: border-box;
+  * {
+    box-sizing: border-box;
+  }
+
+  .add-btn {
+    position: fixed;
+    bottom: 0;
+    left: 0;
+    z-index: 999;
+    width: 100%;
+    height: 112px;
+    line-height: 112px;
+    background: #3975C6;
+    font-size: 32px;
+    font-family: PingFangSC-Medium, PingFang SC;
+    font-weight: 500;
+    color: #FFF;
+
+    div {
+      text-align: center;
     }
+  }
 
-    .add-btn {
-      position: fixed;
-      bottom: 0;
-      left: 0;
-      z-index: 999;
-      width: 100%;
-      height: 112px;
-      line-height: 112px;
-      background: #3975C6;
+  .tags-group {
+    margin-bottom: 16px;
+    padding: 0 32px 16px;
+    background: #fff;
+
+    & > h2 {
+      height: 108px;
+      line-height: 108px;
+      color: #333333;
       font-size: 32px;
-      font-family: PingFangSC-Medium, PingFang SC;
-      font-weight: 500;
-      color: #FFF;
-      div{
-        text-align: center;
-      }
     }
 
-    .tags-group {
-      margin-bottom: 16px;
-      padding: 0 32px 16px;
-      background: #fff;
+    .tags-list {
+      display: flex;
+      flex-wrap: wrap;
+      line-height: 1;
 
-      & > h2 {
-        height: 108px;
-        line-height: 108px;
+      .item {
+        height: 64px;
+        line-height: 64px;
+        margin: 0 16px 16px 0;
+        padding: 0 32px;
         color: #333333;
-        font-size: 32px;
-      }
+        font-size: 28px;
+        background: #F3F4F7;
+        border-radius: 4px;
+        max-width: 100%;
+        text-overflow: ellipsis;
+        overflow: hidden;
+        white-space: nowrap;
 
-      .tags-list {
-        display: flex;
-        flex-wrap: wrap;
-        line-height: 1;
-
-        .item {
-          height: 64px;
-          line-height: 64px;
-          margin: 0 16px 16px 0;
-          padding: 0 32px;
-          color: #333333;
-          font-size: 28px;
-          background: #F3F4F7;
-          border-radius: 4px;
-
-          &.active {
-            color: #fff;
-            background: #1365DD;
-          }
+        &.active {
+          color: #fff;
+          background: #1365DD;
         }
       }
     }
   }
+}
 </style>

From 53db0bd3b1ca293dd948bb9f02935343f658a84f Mon Sep 17 00:00:00 2001
From: shijingjing <1789544664@qq.com>
Date: Thu, 18 Aug 2022 16:28:40 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E7=9F=9B=E7=9B=BE=E8=B0=83=E8=A7=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/project/saas/AppConflictMediation/Content.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/project/saas/AppConflictMediation/Content.vue b/src/project/saas/AppConflictMediation/Content.vue
index 673b48c0..83133b7f 100644
--- a/src/project/saas/AppConflictMediation/Content.vue
+++ b/src/project/saas/AppConflictMediation/Content.vue
@@ -139,7 +139,7 @@ export default {
         params = {...this.forms}
       }
       params.id = this.id
-      this.$http.post(url, form).then((res) => {
+      this.$http.post(url, params).then((res) => {
         if (res?.code == 0) {
           this.$u.toast(successText)
           uni.$emit('update')