04BEB8CAF7DE4E1AB861FC487E7ADAC8

src/utils/fetch.js

@@ -55,8 +55,8 @@ service.interceptors.request.use(config => {
     if( process.env.BUILD_ENV == "development" ){  // 本地开发环境
       // console.log('环境变量>>>> ', process.env.BUILD_ENV);
       // config.headers['token'] = 'BFD804F3A3194FBBBE113962222839F6';
-      config.headers['token'] = 'F8209898391C40A0B8DBC1ED9E157291';
-      // config.headers['token'] = '1E04ECA4D0A84702AAD5080622EE139A';
+      // config.headers['token'] = 'F8209898391C40A0B8DBC1ED9E157291';
+      config.headers['token'] = '04BEB8CAF7DE4E1AB861FC487E7ADAC8';
       
     }else{
       config.headers['token'] = localStorage.getItem('storageToken')

src/utils/followup/followapis.js

@@ -484,4 +484,12 @@ export const updateScalesStatus = ( data ) => {
   })
 }
 
+// 获取量表详情
+export const getFirstAccess = () => {
+  return fetch({
+    url: getFollowUpSC(`/followup/overView/firstAccess`),
+    method: 'get',
+    data: {},
+  })
+}
 

src/views/followup/plan-manage/new-plan.vue

@@ -94,6 +94,7 @@
 
     <select-patient
       :isShowSelectPatient="isShowSelectPatient"
+      :selectPatientDialogTitle="baseInfo.hasSelectedNum ? '继续添加' : '选择居民'"
       :patientIdList="baseInfo.patientIdList"
       @closeSelectPatient="closeSelectPatient"
       @sureSelectPatient="sureSelectPatient(arguments)"

src/views/followup/plan-manage/plan-list.vue

@@ -81,14 +81,23 @@
         </div>
       </div>
     </div>
+
+    <!-- 协议提醒 -->
+    <el-dialog class="prot-dialog" title="" :visible.sync="isShowProtocolDialog" width="30%" center :show-close=false>
+      <p class="prot-dialog-tips-1">根据相关规定，在您开展履约之前，需要居民授权同意《云鹊平台隐私协议》，否则将导致履约量表部分信息无法录入</p>
+      <span slot="footer" class="dialog-footer">
+        <el-button size="small" type="primary" @click="isShowProtocolDialog = false"> 我知道了 </el-button>
+      </span>
+    </el-dialog>
   </div>
 </template>
 
 <script>
   import BreadCrumb from "@/components/breadcrumb";
-  import { mapState, mapActions} from 'vuex'
-  import {deletePlan, getVerifyStatus} from '@/utils/followup/followapis'
+  import { mapState, mapActions } from 'vuex'
+  import { deletePlan, getVerifyStatus } from '@/utils/followup/followapis'
   import { getSaasDomain } from '@/utils/index'
+  import { getFirstAccess } from '@/utils/followup/followapis'
   // import { messageBox } from '@/utils/utils'
   export default {
     components:{
@@ -150,6 +159,7 @@
           total: 0,
           pageSizes: [10,20,50,100]
         },
+        isShowProtocolDialog: false,
       }
     },
     computed: {
@@ -160,6 +170,7 @@
     created() {
     },
     mounted() {
+      this.isFirstEnter();
       this.init();      
     },
     watch: {},
@@ -167,32 +178,16 @@
       ...mapActions('planManage', ['getPlanList', 'setResidentCrumb', 'setPlanModifyCrumb']),
       // 验证是否首次进入 ################
       isFirstEnter() {
-        // getIsFirstEnter().then((res) => {
-        getVerifyStatus().then((res) => {
-          if(res.code !== '000000') {
-            this.search(1);
-          } else {
-
-            // this.$alert('根据相关规定，在您开展履约项目前，需要居民授权同意\《云鹊平台隐私协议\》，否则将导致履约量表部分信息无法录入', '', {
-            //   confirmButtonText: '我知道了   ',
-            //   showClose: false,
-            //   // center: true,
-            //   roundButton: true,
-            //   customClass: 'plan-list-alert',
-            //   callback: action => {
-            //     return;
-            //   }
-            // });
-
+        getFirstAccess().then((res) => {
+          if(res.code == '000000') {
+            this.isShowProtocolDialog = res.data
           }
-        })
+        });
       },
       init() {
         getVerifyStatus().then((res) => {
           if(res.code === '000000') {
-            // 验证是否首次进入     ################
-            this.isFirstEnter()
-            // this.search(1);
+            this.search(1);
           }else if(res.code === '200008'){
             this.$confirm(`${res.message}`, '提示', {
               confirmButtonText: '去认证',

src/views/followup/plan-manage/resident-list.vue

@@ -2,7 +2,7 @@
   <div class="resident-list">
     <div class="bread-crumb">
       <el-breadcrumb separator="/" >
-        <el-breadcrumb-item v-for="item in residentCrumb">
+        <el-breadcrumb-item v-for="(item, index) in residentCrumb" :key="index">
           <a v-if="item.href" :href="item.href">{{item.name}}</a>
           <span v-else >{{item.name}}</span>
         </el-breadcrumb-item>
@@ -142,7 +142,8 @@
     <add-patient-time
       :showThisPage="showAddPatientTime"
       :addPatientData="addPatientData"
-      @closeAddPatientTime="closeAddPatientTime"></add-patient-time>
+      @closeAddPatientTime="closeAddPatientTime">
+    </add-patient-time>
   </div>
 </template>
 

src/views/followup/reservation-manage/reservation-list.vue

@@ -136,6 +136,13 @@
     <no-enough :isNoEnoughShow="isNoEnoughShow" @closeTipsDialog="closeTipsDialog"></no-enough>
     <change-reservation :isChangeReservation="isChangeReservation" @closeChangeReserve="closeChangeReserve" :reservationForm="needPara"></change-reservation>
     <followup-detail :dialogFormVisible="dialogDetailShow" @closeDetail="closeDetail" :enteringInfo="enteringInfo"></followup-detail>
+    <!-- 协议提醒 -->
+    <el-dialog class="prot-dialog" title="" :visible.sync="isShowProtocolDialog" width="30%" center :show-close=false>
+      <p class="prot-dialog-tips-1">根据相关规定，在您开展履约之前，需要居民授权同意《云鹊平台隐私协议》，否则将导致履约量表部分信息无法录入</p>
+      <span slot="footer" class="dialog-footer">
+        <el-button size="small" type="primary" @click="isShowProtocolDialog = false"> 我知道了 </el-button>
+      </span>
+    </el-dialog>
   </div>
 </template>
 
@@ -149,6 +156,7 @@
   import NoEnough from './dialog/no-enough';
   import ChangeReservation from "./dialog/change-reservation";
   import followupDetail from "@/views/followup/record-manage/dialog/followupDetail";
+  import { getFirstAccess } from '@/utils/followup/followapis'
   export default {
     name: "reservation-list",
     components: {
@@ -199,6 +207,7 @@
           return row.fuPlanPatientTimesId;
         },
         statusTotal: null, //每种状态的总数
+        isShowProtocolDialog: false,
       }
     },
     created() {
@@ -208,6 +217,7 @@
       // 验证是否首次进入     ################
       // this.init();
             
+      this.isFirstEnter();
       if(this.$route.query.planName && this.$route.query.appointTime && this.$route.query.status) {
         this.searchData.planName = this.$route.query.planName;
         this.searchData.planTimes = [this.$route.query.appointTime,this.$route.query.appointTime];
@@ -237,6 +247,15 @@
     methods: {
       ...mapActions('reservationManage', ['getReservationList','getCheckReservation']),
       ...mapActions('recordManage', [ 'getEnteringInfo']),
+
+    // 验证是否首次进入 ################
+      isFirstEnter() {
+        getFirstAccess().then((res) => {
+          if(res.code == '000000') {
+            this.isShowProtocolDialog1 = res.data
+          }
+        });
+      },
       handleSizeChangePre(pageSize) {
         this.getReservationList({
           pageSize,

src/views/patients/labels-manage/dialog/select-patitents.vue

 <template>
   <div class="select-patient-dialog">
     <el-dialog
-      title="添加居民"
+      :title="selectPatientDialogTitle"
       :visible.sync="showSelectPatient"
       v-if="isShowSelectPatient"
       :before-close="clickClose"
@@ -297,6 +297,7 @@
         getRowKeys(row) {
           return row.patientId;
         },
+        // 添加居民
       }
     },
     props: {
@@ -309,6 +310,10 @@
         required: false,
         default: '',
       },
+      selectPatientDialogTitle: {
+        type: String,
+        default: '添加居民'
+      }
     },
     watch: {
       isShowSelectPatient(val){