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

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

src/views/followup/record-manage/dialog/followupDetail.vue

@@ -12,23 +12,24 @@
         <div class="base-content">
           <div class="content-div">
             <div class="c-title">姓名：</div>
-            <div class="c-content">{{enteringInfo.nickname}}</div>
+            <div class="c-content">{{enteringInfo.nickname | emptyFileter}}</div>
           </div>
           <div class="content-div ">
             <div class="c-title">性别：</div>
-            <div class="c-content">{{enteringInfo.sex}}</div>
+            <div class="c-content">{{enteringInfo.sex | emptyFileter}}</div>
           </div>
           <div class="content-div">
             <div class="c-title">年龄：</div>
-            <div class="c-content">{{enteringInfo.age}}岁</div>
+            <div class="c-content" v-if="enteringInfo.age">{{enteringInfo.age | emptyFileter}}岁</div>
+            <div class="c-content" v-else>{{enteringInfo.age | emptyFileter}}</div>
           </div>
           <div class="content-div">
             <div class="c-title">身份证号：</div>
-            <div class="c-content">{{enteringInfo.idNo}}</div>
+            <div class="c-content">{{enteringInfo.idNo | emptyFileter}}</div>
           </div>
           <div class="content-div">
             <div class="c-title">联系方式：</div>
-            <div class="c-content">{{enteringInfo.mobilePhone}}</div>
+            <div class="c-content">{{enteringInfo.mobilePhone | emptyFileter}}</div>
           </div>
         </div>
       </div>
@@ -36,17 +37,18 @@
         <div class="base-content">
           <div class="content-div">
             <div class="c-title">随访计划名称：</div>
-            <div class="c-content">{{enteringInfo.name}}</div>
+            <div class="c-content">{{enteringInfo.name | emptyFileter}}</div>
           </div>
         </div>
         <div class="group-info base-content">
           <div class="content-div">
             <div class="c-title">随访时间点：</div>
-            <div class="c-content">第{{enteringInfo.timeNo}}次随访</div>
+            <div class="c-content" v-if="enteringInfo.timeNo">第{{enteringInfo.timeNo}}次随访</div>
+            <div class="c-content" v-else>{{enteringInfo.timeNo | emptyFileter}}</div>
           </div>
           <div class="content-div">
             <div class="c-title">随访方式：</div>
-            <div class="c-content">{{enteringInfo.fuPlanType}}</div>
+            <div class="c-content">{{enteringInfo.fuPlanType | emptyFileter}}</div>
           </div>
           <div class="content-div" v-if="enteringInfo.executePlanTime">
             <div class="c-title">实际随访时间：</div>
@@ -58,16 +60,16 @@
           </div>
           <div class="content-div">
             <div class="c-title">随访预约时间：</div>
-            <div class="c-content">{{enteringInfo.appointmentTime}}</div>
+            <div class="c-content">{{enteringInfo.appointmentTime | emptyFileter}}</div>
           </div>
         </div>
         <div class="group-info base-content flex-start">
           <div class="content-div">
             <div class="c-title">随访状态：</div>
-            <div class="c-content">{{enteringInfo.status}}</div>
+            <div class="c-content">{{enteringInfo.status | emptyFileter}}</div>
           </div>
           <div class="content-div">
-            <p class="tip">备注：{{enteringInfo.remarks}}</p>
+            <p class="tip">备注：{{enteringInfo.remarks | emptyFileter}}</p>
           </div>
         </div>
       </div>
@@ -146,7 +148,16 @@
       closeDetail(){
         this.$emit('closeDetail',false)
       },
-    }
+    },
+    filters: {
+      emptyFileter: function(value) {
+        if (!value) {
+          return '-';
+        } else {
+          return value;
+        }
+      },
+    },
   }
 </script>
 

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

@@ -43,7 +43,8 @@
           <el-table :data="recordList.enteringDtos" style="width: 100%;margin-top: 20px;">
           <el-table-column prop="nickname" label="姓名" min-width="100" align="center">
             <template slot-scope="scope">
-              <span style="cursor: pointer" @click="visitDetail(scope.row)">{{scope.row.nickname}}</span>
+              <!--<span style="cursor: pointer" @click="visitDetail(scope.row)">{{scope.row.nickname}}</span>-->
+              <el-button type="text" @click="visitDetail(scope.row)">{{scope.row.nickname}}</el-button>
             </template>
           </el-table-column>
           <el-table-column prop="mobilePhone" label="手机号" min-width="100" align="center"></el-table-column>
@@ -220,7 +221,7 @@
           this.$router.push({
             name: 'formTemplate',
             params: {
-              data: formList[0]
+              data: this.formList[0]
             }
           })
         }else {
@@ -254,7 +255,7 @@
       },
       closeChangeStatus(val){
         this.isShowChangeDialog = val;
-        this.search(1);
+        this.search();
         // let getArguments = arguments[0];
         // this.isShowChangeDialog = getArguments[0];
         // this.statusForm = getArguments[1];

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

@@ -346,6 +346,10 @@
       },
       closeChangeReserve(val){
         this.isChangeReservation = val;
+        this.getReservationList({
+          ...this.setSearchData(),
+          status: this.status,
+        })
       },
       handleSelectionChange(val){
         for(let i in val){