Merge remote-tracking branch 'origin/dev' into dev

src/apps/AppMeetingNotice/detail.vue

@@ -56,8 +56,8 @@
         </u-row>
       </div>
 
-      <div class="footer cancel" v-if="detail.status==1 && detail.createUserId == user.id" @click="handleCancel">取消会议
+      <div class="footer cancel" v-if="detail.status == 2 && data.joinStatus == 0">签到</div>
-      </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)">
@@ -69,13 +69,14 @@
           </div>
           <div @click="updateStatus(1)">确认会议</div>
         </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="">-->
         <!--        </div>-->
       </template>
 
+     
+
     </template>
     <template v-else>
       <div class="att-list">

src/apps/AppResidentActivitie/Add.vue

@@ -205,8 +205,11 @@ export default {
                 }, 600)
               }
             })
+            .catch(() => {
+              this.$u.toast('新增失败')
+            })
         } else {
-          this.$u.toast('失败')
+          this.$u.toast('新增失败')
         }
       })
     },

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;

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">

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) {

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 {
+    // & > div:first-child {
-      width: 50%;
+    //   width: 50%;
-      height: 100%;
+    //   height: 100%;
-      display: flex;
+    //   display: flex;
-      align-items: center;
+    //   align-items: center;
-      justify-content: center;
+    //   justify-content: center;
-    }
+    // }
 
-    & > div:last-child {
+    // & > div:last-child {
-      width: 50%;
+    //   width: 50%;
-      height: 100%;
+    //   height: 100%;
-      color: #FFFFFF;
+    //   color: #FFFFFF;
-      display: flex;
+    //   display: flex;
-      align-items: center;
+    //   align-items: center;
-      justify-content: center;
+    //   justify-content: center;
-      background-color: #1365DD;
+    //   background-color: #1365DD;
-    }
+    // }
 
     & > label {
       display: flex;

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>

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) }}