Merge branch 'dev-followUp-20190312' of...

Merge branch 'dev-followUp-20190312' of http://192.168.110.53/com.pica.cloud.education.frontend/pica.cloud.web-education-admin into dev-followUp-20190312

src/utils/followup/followapis.js

@@ -142,6 +142,15 @@ export const deletePlan = (planId) => {
     description: '删除计划',
   })
 };
+export const getVerifyStatus = (params) => {
+  return fetch({
+    headers,
+    url: getFollowUpSC(`/followup/plans/validate/status`),
+    method: 'get',
+    params: params,
+    description: '认证校验',
+  })
+};
 /*预约管理*/
 export const getReservationList = (data) => {
   return fetch({

src/views/followup/plan-manage/dialog/set-time-node.vue

@@ -11,7 +11,7 @@
     </div>
 
     <div class="add-time-content">
-      <div class="time-line-scroll">
+      <div class="time-line-scroll special-control-class">
         <el-tabs v-model="activeTab" type="card" @tab-remove="deleteTimeNode" :closable="tabClosable()">
 
           <el-tab-pane
@@ -40,7 +40,7 @@
                         clearable />
                     </el-form-item>
                     <el-form-item prop="timeUnit" class="ml20">
-                      <el-select style="width:200px;" v-model="itemTimeForm.timeUnit" placeholder="请选择" @change="choseTimeUit" :disabled="itemTimeForm.isDisabled">
+                      <el-select style="width:400px;" v-model="itemTimeForm.timeUnit" placeholder="请选择" @change="choseTimeUit" :disabled="itemTimeForm.isDisabled" :popper-append-to-body="false">
                         <el-option
                           v-for="(item,index) in markOptions"
                           :key="index"
@@ -64,6 +64,7 @@
                     :multiple-limit=3
                     :disabled="itemIsDisabled(itemTimeForm)"
                     @change="changeRemindDay"
+                    :popper-append-to-body="false"
                     placeholder="请选择">
                     <el-option
                       v-for="(item_sub,index) in remindOptions"
@@ -80,6 +81,7 @@
                       placeholder="选择推送时间"
                       clearable
                       @change="changePushDay"
+                      :popper-append-to-body="false"
                       :disabled="itemIsDisabled(itemTimeForm)"
                     >
                       <el-option
@@ -110,6 +112,7 @@
                     :multiple-limit=3
                     @change="changeFollowId"
                     :disabled="itemIsDisabled(itemTimeForm)"
+                    :popper-append-to-body="false"
                     placeholder="请选择">
                     <el-option
                       v-for="(item_sub,index) in formOptions"
@@ -735,7 +738,7 @@
       /*background-color: #F0F2F5;*/
       padding: 10px;
       overflow-x: scroll;
-      overflow-y: hidden;
+      overflow-y: auto;
       white-space: nowrap;
       position: relative;
       cursor: pointer;
@@ -787,3 +790,9 @@
     margin-left: 20px;
   }
 </style>
+<style>
+  .special-control-class .el-tabs__content{
+      overflow: visible !important;
+    }
+</style>
+

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

@@ -10,7 +10,7 @@
               <el-input v-model="searchData.name" placeholder="请输入关键词" maxlength="20" style="width: 250px" clearable></el-input>
             </el-form-item>
             <el-form-item label="开始年份">
-              <el-select v-model="searchData.startYear" placeholder="请选择时间范围" style="width: 250px">
+              <el-select v-model="searchData.startYear" placeholder="请选择时间范围" style="width: 250px" :popper-append-to-body="false">
                 <el-option label="全部" value=""></el-option>
                 <el-option
                   v-for="(item,index) in timeRangeList"
@@ -87,7 +87,8 @@
 <script>
   import BreadCrumb from "@/components/breadcrumb";
   import { mapState, mapActions} from 'vuex'
-  import {deletePlan} from '@/utils/followup/followapis'
+  import {deletePlan, getVerifyStatus} from '@/utils/followup/followapis'
+  import { getSaasDomain } from '@/utils/index'
   export default {
     components:{
       BreadCrumb,
@@ -156,10 +157,33 @@
       })
     },
     created() {
-      this.search(1);
+      this.init();
     },
+    watch: {},
     methods: {
       ...mapActions('planManage', ['getPlanList', 'setResidentCrumb', 'setPlanModifyCrumb']),
+      init() {
+        getVerifyStatus().then((res) => {
+          if(res.code === '000000') {
+            this.search(1);
+          }else if(res.code === '200008'){
+            this.$confirm(`${res.message}`, '提示', {
+              confirmButtonText: '去认证',
+              cancelButtonText: '取消',
+              type: 'warning'
+            }).then(() => {
+              //confirmButton操作
+              window.location.href = getSaasDomain(`/saas/pica_personal_edit.html?ZmxhZz0x`);
+            }).catch(() => {
+              //cancelButton操作
+              this.$router.push({path: '/'})
+            });
+          }else {
+            this.$message.error(res.message);
+            this.$router.push({path: '/'})
+          }
+        })
+      },
       async search(currentPage){
         await this.getPlanList({
           ...this.searchData,

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

@@ -8,7 +8,7 @@
         </el-breadcrumb-item>
       </el-breadcrumb>
     </div>
-    <div class="new-plan-content f-main-content screenSet">
+    <div class="new-plan-content f-main-content screenSet" id="screenSet">
       <div class="header">
         <div class="title">
           <span>修改计划</span>
@@ -39,6 +39,7 @@
             v-model="planDetailData.remarksStatus"
             placeholder="请选择随访种类"
             size="small"
+            :popper-append-to-body="false"
             clearable>
             <el-option
               v-for="item in remarkOption"
@@ -92,6 +93,8 @@
   import addPatientTime from '@/views/followup/plan-manage/dialog/add-patient-time';
 
   import { mapState, mapActions } from 'vuex'
+  import * as commonUtil from '../../../utils/utils'
+
   export default {
     name: "plan-modify",
     components: {
@@ -152,6 +155,10 @@
       let planModifyCrumbList = sessionStorage.getItem('planModifyCrumb');
       this.planModifyCrumb = JSON.parse(planModifyCrumbList);
     },
+    // 挂载到Dom完成时
+    mounted: function() {
+        commonUtil.resizeHeight()
+    },
     computed: {
       ...mapState('planManage', {
         planDetail: state => state.planDetail,

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

@@ -20,7 +20,7 @@
               <el-input v-model="searchData.mobile" size="small" placeholder="请输入手机号" clearable></el-input>
             </el-form-item>
             <el-form-item label="分组：" prop="labelId">
-              <el-select v-model="searchData.labelId" size="small" clearable>
+              <el-select v-model="searchData.labelId" size="small" clearable :popper-append-to-body="false">
                 <el-option label="全部" value=""></el-option>
                 <el-option
                   v-for="item in groupList"
@@ -31,7 +31,7 @@
               </el-select>
             </el-form-item>
             <el-form-item label="随访开始时间：" prop="startDate" size="small">
-              <el-select v-model="searchData.startDate" size="small" clearable>
+              <el-select v-model="searchData.startDate" size="small" clearable :popper-append-to-body="false">
                 <el-option label="全部" value=""></el-option>
                 <el-option
                   v-for="(item, index) in followStartTimeList"

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

@@ -61,11 +61,11 @@
               <span :class="scope.row.status == 1 ? 'status-span': ''">{{ scope.row.status | statusFileter }}</span>
             </template>
           </el-table-column>
-          <el-table-column label="操作" fixed="right" align="center" min-width="300">
+          <el-table-column label="操作" fixed="right" align="center" min-width="260">
             <template slot-scope="scope">
               <el-button class="btn-right-class" type="text" @click="editRow(scope.row)">随访录入</el-button>|
-              <el-button class="btn-right-class" type="text" @click="changeStatusRow(scope.row)"> 变更随访状态</el-button>|
-              <el-button type="text" @click="sendRow(scope.row)">发送患教</el-button>
+              <el-button class="btn-right-class" type="text" @click="changeStatusRow(scope.row)"> 变更随访状态</el-button>
+              <!--|<el-button type="text" @click="sendRow(scope.row)">发送患教</el-button>-->
             </template>
           </el-table-column>
           </el-table>