Merge branch 'dev-caiji' into shibei_master

src/views/modules/base/collect.vue

@@ -2,7 +2,7 @@
   <div class="resi-container">
     <el-card ref="searchCard" class="search-card">
          <el-form ref="searchForm" :inline="true" :model="fmData" class="demo-form-inline">
-           <el-form-item label="所在社区" prop="orgId">
+           <el-form-item v-if="communityList.length > 0" label="所在社区" prop="orgId">
             <el-select
                   v-model.trim="fmData.orgId"
                   placeholder="所在社区"
@@ -83,7 +83,7 @@
           <template slot-scope="scope">
             <span v-if="scope.row.ymjz == 1">全程接种</span>
             <span v-if="scope.row.ymjz == 2">未全程接种</span>
-            <span v-if="scope.row.ymjz == 3">未接种</span>
+            <span v-if="scope.row.ymjz == 0">未接种</span>
           </template>
         </el-table-column>
         <!-- <el-table-column prop="organizationCreatedTime" align="center" label="创建时间"> -->

src/views/pages/caiji.vue

@@ -203,6 +203,7 @@ import { requestPost } from "@/js/dai/request";
 import { Toast } from "mint-ui";
 import { MessageBox } from 'mint-ui';
 import { Loading } from 'element-ui' // 引入Loading服务
+import { messages } from '@/i18n'
 
 let loading // 加载动画
 export default {
@@ -308,19 +309,23 @@ export default {
   computed: {
 
   },
-  created () { },
+
-  mounted () {
+  created () {
     console.log(this.$route)
 
     this.shequId = this.$route.params.id
     this.customerId = this.$route.query.customerId
     this.shequName = this.$route.query.name
+    document.title = this.shequName
+  },
+  mounted () {
+
 
     let envShow = process.env.VUE_APP_NODE_ENV
     console.log('环境', envShow)
 
-    // let internalShequId = ['1202807601961984002', '6e511da6816e53af4cda952365a26eb9',]
+    let internalShequId = ['1202807601961984002', '6e511da6816e53af4cda952365a26eb9',]
-    let internalShequId = ['1202807601961984002',]
+    // let internalShequId = ['1202807601961984002',]
     // if (envShow === 'dev' || envShow === 'prod:sit') { // 开发环境
     //   internalShequId = null
     // } else if (envShow === 'prod:uat') { // 体验
@@ -855,7 +860,10 @@ export default {
     }
 
 
-  }
+  },
+  beforeDestroy () {
+    document.title = messages[val].brand.lg
+  },
 }
 </script>