From 496f97568b805930d407fe0a523eef5571f762a6 Mon Sep 17 00:00:00 2001
From: liuye <liuye@sinoecare.com>
Date: Fri, 18 Mar 2022 09:20:38 +0800
Subject: [PATCH 1/6] =?UTF-8?q?=E8=B5=B0=E8=AE=BF=E6=85=B0=E9=97=AE?=
 =?UTF-8?q?=E6=8F=90=E7=A4=BA=E6=96=87=E5=AD=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/apps/AppWalkask/AppWalkask.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/apps/AppWalkask/AppWalkask.vue b/src/apps/AppWalkask/AppWalkask.vue
index 33fdc209..53b68946 100644
--- a/src/apps/AppWalkask/AppWalkask.vue
+++ b/src/apps/AppWalkask/AppWalkask.vue
@@ -17,7 +17,7 @@
               </AiAreaPicker>
             </div>
 
-            <u-search v-model="keyword" :clearabled="true" placeholder="请输入标题、对象或走访人" :show-action="false" bg-color="#1F5CAF" search-icon-color="#E2E8F1" color="#E2E8F1" height="58" @search="handerSearch" @clear="handerClear"></u-search>
+            <u-search v-model="keyword" :clearabled="true" placeholder="请输入标题、对象" :show-action="false" bg-color="#1F5CAF" search-icon-color="#E2E8F1" color="#E2E8F1" height="58" @search="handerSearch" @clear="handerClear"></u-search>
           </div>
 
           <template v-if="data.length > 0">

From 40d572d46627f36d9f10147a731bf09458e6cd66 Mon Sep 17 00:00:00 2001
From: liuye <liuye@sinoecare.com>
Date: Fri, 18 Mar 2022 09:44:27 +0800
Subject: [PATCH 2/6] =?UTF-8?q?=E5=85=AC=E6=96=87=E6=B5=81=E8=BD=AC?=
 =?UTF-8?q?=E7=BB=93=E6=9D=9F=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../AppDocumentFlow/AppDocumentFlow.vue       |  4 ++
 .../shandong10086/AppDocumentFlow/detail.vue  | 52 +++++++++++++------
 2 files changed, 39 insertions(+), 17 deletions(-)

diff --git a/src/project/shandong10086/AppDocumentFlow/AppDocumentFlow.vue b/src/project/shandong10086/AppDocumentFlow/AppDocumentFlow.vue
index 6e8824fa..ccd55a6d 100644
--- a/src/project/shandong10086/AppDocumentFlow/AppDocumentFlow.vue
+++ b/src/project/shandong10086/AppDocumentFlow/AppDocumentFlow.vue
@@ -50,6 +50,10 @@ export default {
   },
   onLoad() {
     this.$dict.load("officialDocumentName")
+    uni.$on('updateList', () => {
+      this.current = 1
+      this.getList()
+    })
   },
   methods: {
     tag(status) {
diff --git a/src/project/shandong10086/AppDocumentFlow/detail.vue b/src/project/shandong10086/AppDocumentFlow/detail.vue
index b565cb46..957994a0 100644
--- a/src/project/shandong10086/AppDocumentFlow/detail.vue
+++ b/src/project/shandong10086/AppDocumentFlow/detail.vue
@@ -84,7 +84,8 @@
       </div>
       <div class="footer" v-if="detail.flowRight==1 && detail.readType==0">
         <div @click="handleClick(0)">批示</div>
-        <div @click="handleClick(1)">流转</div>
+        <div @click="handleClick(1)" style="background-color: #1365DD;color: #FFFFFF">流转</div>
+        <div @click="end()" style="background-color: #f46;color: #FFFFFF">结束</div>
       </div>
       <div class="footer" v-if="detail.readType==1 && detail.flowRight==1" @click="read"
            style="background-color: #1365DD;color: #FFFFFF">我已阅完
@@ -182,6 +183,19 @@ export default {
       } else {
         this.userSelect = true
       }
+    },
+    end() {
+      this.$confirm('确定结束该公文流转？').then(() => {
+        this.$http.post(`/app/appofficialdocumentinfo/finishById?id=${this.id}`).then(res => {
+          if (res.code == 0) {
+            this.$u.toast('操作成功')
+            uni.$emit('updateList')
+            setTimeout(() => {
+              uni.navigateBack()
+            })
+          }
+        })
+      })
     }
   },
   onShow() {
@@ -403,25 +417,29 @@ export default {
 
     & > div {
       color: #333333;
+      flex: 1;
+      height: 112px;
+      text-align: center;
+      line-height: 112px;
     }
 
-    & > div:first-child {
-      width: 50%;
-      height: 100%;
-      display: flex;
-      align-items: center;
-      justify-content: center;
-    }
+    // & > div:first-child {
+    //   width: 50%;
+    //   height: 100%;
+    //   display: flex;
+    //   align-items: center;
+    //   justify-content: center;
+    // }
 
-    & > div:last-child {
-      width: 50%;
-      height: 100%;
-      color: #FFFFFF;
-      display: flex;
-      align-items: center;
-      justify-content: center;
-      background-color: #1365DD;
-    }
+    // & > div:last-child {
+    //   width: 50%;
+    //   height: 100%;
+    //   color: #FFFFFF;
+    //   display: flex;
+    //   align-items: center;
+    //   justify-content: center;
+    //   background-color: #1365DD;
+    // }
 
     & > label {
       display: flex;

From 5f60e1e1da85321d15fb21d2c09c53bc2fb048ed Mon Sep 17 00:00:00 2001
From: liuye <liuye@sinoecare.com>
Date: Fri, 18 Mar 2022 10:34:20 +0800
Subject: [PATCH 3/6] =?UTF-8?q?=E4=BC=9A=E8=AE=AE=E9=80=9A=E7=9F=A5?=
 =?UTF-8?q?=E7=AD=BE=E5=88=B0=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/apps/AppMeetingNotice/detail.vue | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/apps/AppMeetingNotice/detail.vue b/src/apps/AppMeetingNotice/detail.vue
index 158c8729..58eb8cd0 100644
--- a/src/apps/AppMeetingNotice/detail.vue
+++ b/src/apps/AppMeetingNotice/detail.vue
@@ -56,9 +56,8 @@
         </u-row>
       </div>
 
-      <div class="footer cancel" v-if="detail.status==1 && detail.createUserId == user.id" @click="handleCancel">取消会议
-      </div>
-
+      <div class="footer cancel" v-if="detail.status==1 && detail.createUserId == user.id" @click="handleCancel">取消会议</div>
+      
       <template v-else>
         <div class="footer" v-if="['1','2'].includes(detail.status) && ['0','3'].includes(detail.joinStatus)">
           <div class="leave" @click="updateStatus(0)">
@@ -69,6 +68,7 @@
           </div>
           <div @click="updateStatus(1)">确认会议</div>
         </div>
+        <div class="footer cancel" v-else>签到</div>
 
         <!--        <div class="footer" v-if="['1','2'].includes(detail.status) && detail.joinStatus!=0">-->
         <!--          <label>{{ detail.joinStatus|transform }}</label>-->
@@ -76,6 +76,8 @@
         <!--        </div>-->
       </template>
 
+     
+
     </template>
     <template v-else>
       <div class="att-list">

From eee2cd79854ceff6b6f6a3831182d10eae78e661 Mon Sep 17 00:00:00 2001
From: liuye <liuye@sinoecare.com>
Date: Fri, 18 Mar 2022 11:28:52 +0800
Subject: [PATCH 4/6] 28322

---
 src/apps/AppMeetingNotice/detail.vue          | 3 +--
 src/saas/AppResidentDocument/DetailPeople.vue | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/apps/AppMeetingNotice/detail.vue b/src/apps/AppMeetingNotice/detail.vue
index 58eb8cd0..ca4b2df0 100644
--- a/src/apps/AppMeetingNotice/detail.vue
+++ b/src/apps/AppMeetingNotice/detail.vue
@@ -56,6 +56,7 @@
         </u-row>
       </div>
 
+      <div class="footer cancel" v-if="detail.status == 2 && data.joinStatus == 0">签到</div>
       <div class="footer cancel" v-if="detail.status==1 && detail.createUserId == user.id" @click="handleCancel">取消会议</div>
       
       <template v-else>
@@ -68,8 +69,6 @@
           </div>
           <div @click="updateStatus(1)">确认会议</div>
         </div>
-        <div class="footer cancel" v-else>签到</div>
-
         <!--        <div class="footer" v-if="['1','2'].includes(detail.status) && detail.joinStatus!=0">-->
         <!--          <label>{{ detail.joinStatus|transform }}</label>-->
         <!--          <img :src="$cdn + tag(detail.joinStatus)" alt="">-->
diff --git a/src/saas/AppResidentDocument/DetailPeople.vue b/src/saas/AppResidentDocument/DetailPeople.vue
index 5251a3ce..edeaf906 100644
--- a/src/saas/AppResidentDocument/DetailPeople.vue
+++ b/src/saas/AppResidentDocument/DetailPeople.vue
@@ -8,7 +8,7 @@
 
       <div class="right">
         <div class="rightTop">
-          <span class="names">{{ data.resident && data.resident.name }}<span class="fileStatuss" v-if="data.fileStatus == 1">已注销</span></span>
+          <span class="names">{{ data.resident && data.resident.name }}<span class="fileStatuss" v-if="data.resident.fileStatus == 1">已注销</span></span>
           <span class="householdNames" v-if="data.resident && data.resident.householdName == 1">户主</span>
           <span class="householdNames" v-else>
             {{ $dict.getLabel('householdRelation', data.resident && data.resident.householdRelation) }}

From 09471d8b1a15f9cd35aaab6124591caa87306dbe Mon Sep 17 00:00:00 2001
From: liuye <liuye@sinoecare.com>
Date: Fri, 18 Mar 2022 11:34:31 +0800
Subject: [PATCH 5/6] 28340

---
 src/saas/AppResidentDocument/DetailCard.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/saas/AppResidentDocument/DetailCard.vue b/src/saas/AppResidentDocument/DetailCard.vue
index 37b559d4..21e95cb2 100644
--- a/src/saas/AppResidentDocument/DetailCard.vue
+++ b/src/saas/AppResidentDocument/DetailCard.vue
@@ -40,7 +40,7 @@
 
             <div class="rightBottom">
               <span>身份证号：</span>
-              <span>{{ item.idNumber.replace(/^(\w{6})\w{8}(.*)$/, '$1********2') }}</span>
+              <span>{{ item.idNumber.replace(/^(\w{6})\w{8}(.*)$/, '$1********$2') }}</span>
             </div>
           </div>
         </div>

From b5f8ce5c19fced486eafb6e937a2eede22a16fcc Mon Sep 17 00:00:00 2001
From: changjinpeng <185154740@qq.com>
Date: Fri, 18 Mar 2022 14:16:19 +0800
Subject: [PATCH 6/6] 28326

---
 src/apps/AppResidentActivitie/Add.vue    | 5 ++++-
 src/apps/AppResidentActivitie/Detail.vue | 9 +++++----
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/apps/AppResidentActivitie/Add.vue b/src/apps/AppResidentActivitie/Add.vue
index 5a6e5e28..418996ff 100644
--- a/src/apps/AppResidentActivitie/Add.vue
+++ b/src/apps/AppResidentActivitie/Add.vue
@@ -205,8 +205,11 @@ export default {
                 }, 600)
               }
             })
+            .catch(() => {
+              this.$u.toast('新增失败')
+            })
         } else {
-          this.$u.toast('失败')
+          this.$u.toast('新增失败')
         }
       })
     },
diff --git a/src/apps/AppResidentActivitie/Detail.vue b/src/apps/AppResidentActivitie/Detail.vue
index ecdf2a60..50c77ffd 100644
--- a/src/apps/AppResidentActivitie/Detail.vue
+++ b/src/apps/AppResidentActivitie/Detail.vue
@@ -261,14 +261,15 @@ export default {
     background: #000;
   }
   .status1 {
-    background: #ff883c;
+    background: #42d784;
+  }
+  .status2 {
+    background: #E4E4E4;
   }
   .status3 {
     background: #1aaaff;
   }
-  .status2 {
-    background: #42d784;
-  }
+
   .status4,
   .status5 {
     background: #e4e4e4;