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/store/followup/planManage.js

@@ -217,7 +217,7 @@ export default {
     },
     getPlanOptions(context, payload) {
       getPlanList({
-        pageNum: -1
+        pageNo: -1
       }).then(({data}) => {
         context.commit('GET_PLAN_OPTION', data);
       });

src/utils/followup/followapis.js

@@ -250,6 +250,17 @@ export const getFollowupTemplate = (data) => {
   })
 }
 
+// 获取随访量表固定模板
+export const getFollowupTableTemplate = (id) => {
+  return fetch({
+    headers,
+    url: getFollowUpSC(`/followup/plans/templets/${id}`),
+    method: 'get',
+    data: {},
+    description: '获取随访量表固定模板',
+  })
+}
+
 // 获取量表列表
 export const getFormOptions = (data)=>{
   return fetch({

src/views/followup/plan-manage/dialog/change-plan.vue

@@ -7,32 +7,32 @@
       v-if="showThisPage"
       :before-close="clickClose"
       center>
-      <el-form :model="planChangeData" label-width="110px">
-        <el-form-item label="分组：">
+      <el-form :model="planChangeData" label-width="110px" :rules="rules" ref="planChangeData">
+        <el-form-item label="分组：" prop="yLabelList">
           <el-select
             v-model="planChangeData.yLabelList"
             multiple
             @change="selectGroup"
             placeholder="请选择">
             <el-option
-              v-for="item in groupList"
-              :key="item.labelId"
+              v-for="(item, index) in groupList"
+              :key="index"
               :label="item.labelName"
               :value="item.labelId">
             </el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="随访计划：">
+        <el-form-item label="随访计划：" prop="planId">
           <el-select v-model="planChangeData.planId" size="small">
             <el-option
-              v-for="item in planOption"
-              :key="item.id"
+              v-for="(item,index) in planOption"
+              :key="index"
               :label="item.name"
               :value="item.id">
             </el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="随访开始时间：">
+        <el-form-item label="随访开始时间：" prop="startDate">
           <el-date-picker
             v-model="planChangeData.startDate"
             type="date"
@@ -51,7 +51,7 @@
 </template>
 
 <script>
-  import { mapState, mapActions} from 'vuex';
+  import { mapState, mapActions } from 'vuex';
   import { changePlan } from '../../../../utils/followup/followapis'
   export default {
     name: "change-plan",
@@ -84,7 +84,12 @@
     data() {
       return {
         showChangePlan: true,
-        selectedGroup: []
+        selectedGroup: [],
+        rules: {
+          planId: [
+            { required: true, message: '请选择随访计划', trigger: 'change' },
+          ],
+        },
       }
     },
     mounted() {
@@ -99,7 +104,7 @@
       })
     },
     methods: {
-      ...mapActions('planManage', ['getPlanOptions','getResidentList']),
+      ...mapActions('planManage', ['getPlanOptions','getResidentList', 'getResidentDetail']),
       selectGroup(val) {
         const _this = this
         _this.selectedGroup = []
@@ -117,39 +122,52 @@
       clickClose() {
         this.$emit('closeChangePlan',false);
       },
-      async changePlans() {
-       // this.clickClose()
-        const { planPatientsId, planId, patientId, startDate } = this.planChangeData
-      //  params.yLabelList = this.selectedGroup
-      //  console.log('变更数据',params)
-        changePlan({
-          planPatientsId,
-          planId,
-          patientId,
-          yLabelList: this.selectedGroup,
-          startDate
-        }).then((data) => {
-          if(data.code == '000000') {
-            this.$message({
-              message: '变更计划成功！',
-              type: 'success'
-            });
-            this.getResidentList({
+      changePlans() {
+        const _this = this
+        this.$refs['planChangeData'].validate(valid => {
+          if (valid) {
+            const { planPatientsId, planId, patientId, startDate } = this.planChangeData;
+            changePlan({
+              planPatientsId,
               planId,
-              status: this.planChangeData.status
-            })
-            this.clickClose()
-          } else {
-            this.$message({
-              message: `${data.message}`,
-              type: 'error'
+              patientId,
+              yLabelList: this.selectedGroup,
+              startDate
+            }).then((data) => {
+              if(data.code == '000000') {
+                this.$message({
+                  message: '变更计划成功！',
+                  type: 'success'
+                });
+                if(this.$route.name == 'residentList') {
+                  this.getResidentList({
+                    planId: this.planChangeData.planIdOld,
+                    status: this.planChangeData.status
+                  });
+                } else if(this.$route.name == 'residentDetail') {
+                  this.$router.push({path: '/followup/plan-manage/resident-detail', query: {patientId: patientId, planId: planId}})
+                  this.getResidentDetail({
+                    planId,
+                    patientId
+                  })
+                }
+
+                this.clickClose()
+              } else {
+                this.$message({
+                  message: `${data.message}`,
+                  type: 'error'
+                });
+              }
+            }).catch((err) => {
+              this.$message({
+                message: `${err.message}`,
+                type: 'error'
+              });
             });
+          } else {
+            return false;
           }
-        }).catch((err) => {
-          this.$message({
-            message: `${err.message}`,
-            type: 'error'
-          });
         });
       },
     },
@@ -157,6 +175,7 @@
       planChangeData(val) {
         const _this = this
         let labelList = val.yLabelList
+        console.log()
         labelList.forEach(function (item, index) {
           let nodeItem  =  _this.groupList.filter(function(item1){
             return item1.labelId == item;

src/views/followup/plan-manage/dialog/finish-followup.vue

@@ -11,7 +11,7 @@
         <el-form
           :model="finishData"
           :rules="rules"
-          label-width="100px">
+          label-width="100px" ref="finishData">
           <el-form-item label="居民：">
             {{finishData.patientName}}
           </el-form-item>
@@ -35,6 +35,7 @@
 </template>
 
 <script>
+  import { mapActions } from 'vuex';
   import { finishPlan } from '../../../../utils/followup/followapis'
   export default {
     name: "finish-followup",
@@ -64,33 +65,52 @@
       }
     },
     methods: {
+      ...mapActions('planManage', ['getResidentList']),
       clickClose() {
         this.$emit('closeFinishFollowup',false)
       },
       finishFollowUp() {
-        const { changeCode, planId, patientIdList } = this.finishData;
-        finishPlan({
-          changeCode,
-          planId,
-          patientIdList,
-        }).then((data) => {
-          if(data.code == '000000') {
-            this.$message({
-              message: '操作成功！',
-              type: 'success'
+        this.$refs['finishData'].validate(valid => {
+          if (valid) {
+            const { changeCode, planId, patientIdList } = this.finishData;
+            finishPlan({
+              changeCode,
+              planId,
+              patientIdList,
+            }).then((data) => {
+              if(data.code == '000000') {
+                this.$message({
+                  message: '操作成功！',
+                  type: 'success'
+                });
+                if(this.$route.name == 'residentList') {
+                  this.getResidentList({
+                    planId,
+                    status: changeCode
+                  })
+                } else if(this.$route.name == 'residentDetail') {
+                  this.getResidentDetail({
+                    planId,
+                    patientId: patientIdList[0]
+                  })
+                }
+
+                this.clickClose()
+              } else {
+                this.$message({
+                  message: `${data.message}`,
+                  type: 'error'
+                });
+              }
+            }).catch((err) => {
+              this.$message({
+                message: `${err.message}`,
+                type: 'error'
+              });
             });
-            this.clickClose()
           } else {
-            this.$message({
-              message: `${data.message}`,
-              type: 'error'
-            });
+            return false;
           }
-        }).catch((err) => {
-          this.$message({
-            message: `${err.message}`,
-            type: 'error'
-          });
         });
       }
     }

src/views/followup/plan-manage/dialog/has-selected-patient.vue

@@ -3,7 +3,6 @@
     <el-dialog
       title="已选居民"
       :visible.sync="showSelectedDialog"
-      v-if="isShowSelectedDialog"
       :before-close="clickClose"
       :close-on-click-modal="false"
       :close-on-press-escape="false"
@@ -13,7 +12,7 @@
           <el-button type="primary" size="small" @click="continueAdd">继续添加</el-button>
         </div>
         <el-table
-          :data="hasSelectedList"
+          :data="eachHasSelectedList"
           center
           style="width: 100%;margin-top: 20px;">
           <el-table-column
@@ -48,12 +47,13 @@
         <el-row type="flex" justify="end" class="margin-top20">
           <el-pagination
             background
-            v-if="hasSelectedList.length"
+            v-if="eachHasSelectedList.length"
             @size-change="handleSizeChangePre"
             @current-change="handleCurrentChangePre"
             layout="total, sizes, prev, pager, next, jumper"
             :current-page="paginationSet.pageNum"
-            :page-sizes="[10, 20, 50, 100]"
+            :page-sizes="[5,10,50,100]"
+            :page-count="paginationSet.total"
             :page-size="paginationSet.pageSize"
             :total="paginationSet.total">
           </el-pagination>
@@ -71,41 +71,41 @@
     data() {
       return {
         showSelectedDialog: true,
+        eachHasSelectedList: [], // 由分页pageSize算出一页多少条数
         paginationSet: {
           pageNum: 1,
-          pageSize: 10,
+          pageSize: 5,
           total: 0
         },
       }
     },
     props: {
-      isShowSelectedDialog: { //是否显示model
-        type: Boolean,
-        default: function() {
-          return false;
-        }
-      },
-      hasSelectedList: {
-        type: Array,
-        default: function() {
-          return []
-        }
-      }
+      hasSelectedList: Array, // 所有已选人数
     },
     mounted() {
-      // if(this.planId) {
-      //
-      // }
+      this.eachHasSelectedList = this.getPageList(this.hasSelectedList)
+      const totalLength = this.hasSelectedList.length
+      this.paginationSet.total = totalLength
     },
     methods: {
+      getPageList(list){
+        const pageNum = this.paginationSet.pageNum -1
+        const pageSize = this.paginationSet.pageSize
+        return list.slice(pageNum,pageSize)
+      },
       clickClose() {
         this.$emit('closeSelectedDialog',false)
       },
       continueAdd() {
         this.$emit('continueAdd', false)
       },
-      handleSizeChangePre() {},
-      handleCurrentChangePre() {},
+      handleSizeChangePre(val) {
+        console.log(val)
+      },
+      handleCurrentChangePre(val) {
+        this.paginationSet.pageNum = val
+        this.eachHasSelectedList = this.getPageList(this.hasSelectedList)
+      },
     }
   }
 </script>

src/views/followup/plan-manage/dialog/select-patient.vue

@@ -133,6 +133,15 @@
         allSelects: [],
         eachSelects: [],//仅仅是操作选择的总人员
 //        totalSelect: [],// 当前所选的人
+        labelId:  '',
+        diseaseId:  '',
+        age:  '',
+        sex:  '',
+        ageBegin:  '',
+        ageEnd:  '',
+        srvPackageId: '',
+        searchCondition: '',
+
         patientsData: [],
         searchData: {
           sex: '性别',
@@ -173,41 +182,58 @@
     watch: {
       isShowSelectPatient(val){
         if(val){
-        this.getPatientsList({pageNum: this.paginationSet.pageNum})
+        this.getPatientsList()
           // 获取常量 性别、年龄
           getBasicData({
             numList: 'P057,P006'
           }).then(res=>{
+            this.sexOptions = [{
+              no: '',
+              value: '性别'
+            }];
             this.sexOptions = this.sexOptions.concat(res.data.P006);//性别
+            this.ageOptions = [{
+              no: '',
+              value: '年龄范围'
+            }]
             this.ageOptions = this.ageOptions.concat(res.data.P057);//年龄段
           })
 
           // 获取所有疾病
           getAllDiseases().then(res=>{
+            this.diseaseOptions = [{
+              diseaseId: '',
+              diseaseName: '基础疾病'
+            }]
             this.diseaseOptions = this.diseaseOptions.concat(res.data);
           })
 
           // 获取所有分组
           getAllLabels({type: 1}).then(res=>{
+            this.labelOptions = [{
+              labelId: '',
+              labelName: '分组'
+            }]
             this.labelOptions = this.labelOptions.concat(res.data.labelNameList);
           })
         }
       }
     },
     methods: {
-      getPatientsList(opts){
-        getPlanPatientsList({
+      getPatientsList(){
+        const data = {
           pageSize: this.paginationSet.pageSize,
-          pageNo: opts.pageNum,
-          labelId:opts.labelId,
-          diseaseId: opts.diseaseId,
-          age: opts.age,
-          sex: opts.sex,
-          ageBegin: opts.ageBegin,
-          ageEnd: opts.ageEnd,
-          srvPackageId:opts.srvPackageId,
-          searchCondition:opts.searchCondition,
-        }).then(res=>{
+          pageNo: this.paginationSet.pageNum,
+          labelId:this.labelId,
+          diseaseId: this.diseaseId,
+          age: this.age,
+          sex: this.sex,
+          ageBegin: this.ageBegin,
+          ageEnd: this.ageEnd,
+          srvPackageId:this.srvPackageId,
+          searchCondition:this.searchCondition,
+        }
+        getPlanPatientsList(data).then(res=>{
           if(res.data.patientList){
             this.patientsData = res.data.patientList //接口获取的当页居民
             this.getSex()
@@ -222,6 +248,8 @@
                 }
               })
             }
+          }else{
+            this.patientsData = []
           }
         })
       },
@@ -248,9 +276,8 @@
       // 切换分页
       handleCurrentChangePre(val) {
         console.log('handleCurrentChangePre')
-        this.getPatientsList({
-          pageNum: val
-        })
+        this.paginationSet.pageNum = val
+        this.getPatientsList()
       },
       clickClose(){
         this.$emit('closeSelectPatient',false)
@@ -261,45 +288,33 @@
       handleSizeChangePre(val) {
         console.log('handleSizeChangePre')
         this.paginationSet.pageSize = val
-        this.getPatientsList({
-          pageNum:this.paginationSet.pageNum
-        })
+        this.getPatientsList()
       },
       changeSex(val){
-        this.getPatientsList({
-          sex: val,
-          pageNum: this.paginationSet.pageNum
-        })
+        this.sex = val
+        this.getPatientsList()
       },
       changeAge(val){
         if(val=='年龄范围'){
           val = null
         }
-        this.getPatientsList({
-          age: val,
-          ageBegin: this.ageDate(val).ageBegin,
-          ageEnd: this.ageDate(val).ageEnd,
-          pageNum: this.paginationSet.pageNum
-        })
+        this.age = val;
+        this.ageBegin = this.ageDate(val).ageBegin;
+        this.ageEnd = this.ageDate(val).ageEnd;
+        this.getPatientsList()
       },
       changeDisease(val){
-        this.getPatientsList({
-          diseaseId: val,
-          pageNum: this.paginationSet.pageNum
-        })
+        this.diseaseId = val
+        this.getPatientsList()
       },
       changeLabel(val){
-        this.getPatientsList({
-          labelId: val,
-          pageNum: this.paginationSet.pageNum
-        })
+        this.labelId = val
+        this.getPatientsList()
       },
       searchHandler() {
         const searchCondition = this.searchData.searchCondition
-        this.getPatientsList({
-          searchCondition: searchCondition,
-          pageNum: this.paginationSet.pageNum
-        })
+        this.searchCondition = searchCondition
+        this.getPatientsList()
       },
       ageDate(val){
         var ageObj;

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

@@ -6,16 +6,26 @@
           <el-form-item prop="timeNo">
             <el-input
               v-model="timeForm.timeNo"
-              type="number"
+              type="tel"
               size="small"
               placeholder="请输入"
+              :disabled="isStandedTemplate"
+              maxlength="2"
               clearable />
           </el-form-item>
           <el-form-item prop="timeUnit" class="ml20">
-            <el-select v-model="timeForm.timeUnit" placeholder="请选择" :disabled="timeForm.isDisabled">
+            <el-select v-if="!isStandedTemplate" v-model="timeForm.timeUnit" placeholder="请选择" :disabled="timeForm.isDisabled">
               <el-option
-                v-for="item in markOptions"
-                :key="item.no"
+                v-for="(item,index) in markOptions"
+                :key="index"
+                :label="item.value"
+                :value="item.no">
+              </el-option>
+            </el-select>
+            <el-select v-if="isStandedTemplate" v-model="timeForm.timeUnit" placeholder="请选择" :disabled="isStandedTemplate">
+              <el-option
+                v-for="(item,index) in markOptions"
+                :key="index"
                 :label="item.value"
                 :value="item.no">
               </el-option>
@@ -25,43 +35,76 @@
       </el-form-item>
       <el-form-item label="随访方式" prop="type">
         <el-radio-group v-model="timeForm.type" size="small">
-          <el-radio v-for="item in followTypeList" :label="item.no">{{item.value}}</el-radio>
+          <el-radio v-for="(item,index) in followTypeList" :key="index" :label="item.no" :disabled="isStandedTemplate">{{item.value}}</el-radio>
         </el-radio-group>
       </el-form-item>
       <el-form-item label="提醒医生预约居民">
         <el-select
+          v-if="!isStandedTemplate"
           v-model="timeForm.remindDay"
           multiple
           :multiple-limit=3
           @change="changeRemindDay"
           placeholder="请选择">
           <el-option
-            v-for="item in remindOptions"
-            :key="item.no"
+            v-for="(item,index) in remindOptions"
+            :key="index"
             :label="item.value"
             :value="item.no">
           </el-option>
         </el-select>
+
+        <!--固定模板需要填充-->
+        <el-select
+          v-if="isStandedTemplate"
+          v-model="timeForm.remindDay"
+          multiple
+          :multiple-limit=3
+          :disabled="isStandedTemplate"
+          placeholder="请选择">
+          <el-option
+            v-for="(item,index) in remindOptionsCopy"
+            :key="index"
+            :label="item.startDaysStr"
+            :value="item.startDays">
+          </el-option>
+        </el-select>
       </el-form-item>
       <el-form-item label="推送患教">
         <div style="display: flex">
+
           <el-select
+            v-if="!isStandedTemplate"
             v-model="timeForm.pushDay"
             placeholder="选择推送时间"
             clearable
           >
             <el-option
-              v-for="item in pushTimeOptions"
-              :key="item.no"
+              v-for="(item,index) in pushTimeOptions"
+              :key="index"
               :label="item.value"
               :value="item.no">
             </el-option>
           </el-select>
+
+          <!--固定模板需要填充-->
+          <el-select
+            v-if="isStandedTemplate"
+            v-model="timeForm.pushDay"
+            placeholder="选择推送时间"
+            clearable
+            :disabled="isStandedTemplate"
+          >
+            <el-option
+              :label="timeForm.startDaysStr"
+              :value="timeForm.pushDay">
+            </el-option>
+          </el-select>
           <el-button  plain class="ml20" @click="goSelectCartoon"  v-if="!timeForm.hasSelected">选择健康漫画</el-button>
           <div class="selected-div ml20" v-if="timeForm.hasSelected">
             <span>《{{timeForm.comentMsg.header_name}}》</span>
-            <el-button type="text" @click="goSelectCartoon">重选</el-button>
-            <el-button type="text" @click="deleteClick">删除</el-button>
+            <el-button type="text" @click="goSelectCartoon" v-if="!isStandedTemplate">重选</el-button>
+            <el-button type="text" @click="deleteClick" v-if="!isStandedTemplate">删除</el-button>
           </div>
         </div>
       </el-form-item>
@@ -71,21 +114,43 @@
       </div>
       <el-form-item label="随访登记表">
         <el-select
+          v-if="!isStandedTemplate"
           v-model="timeForm.followResourceId"
           multiple
-          :multiple-limit=2
+          :multiple-limit=3
           @change="changeFollowId"
           placeholder="请选择">
           <el-option
-            v-for="item in formOptions"
-            :key="item.scaleNo"
+            v-for="(item,index) in formOptions"
+            :key="index"
             :label="item.name"
             :value="item.scaleNo">
           </el-option>
         </el-select>
+
+        <!--固定模板需要填充-->
+        <el-select
+          v-if="isStandedTemplate"
+          v-model="timeForm.followResourceId"
+          multiple
+          :multiple-limit=3
+          @change="changeFollowId"
+          :disabled="isStandedTemplate"
+          placeholder="请选择">
+          <el-option
+            v-for="(item,index) in formOptionsCopy"
+            :key="index"
+            :label="item.sendContent"
+            :value="item.startDays">
+          </el-option>
+        </el-select>
       </el-form-item>
     </el-form>
-    <select-cartoon :isSelectCartoon="isSelectCartoon" @closeSelectCartoon="closeSelectCartoon" @pushConmentMsg="pushConmentMsg"></select-cartoon>
+    <select-cartoon
+      :isSelectCartoon="isSelectCartoon"
+      @closeSelectCartoon="closeSelectCartoon"
+      @pushConmentMsg="pushConmentMsg"
+    />
   </div>
 </template>
 <script>
@@ -106,10 +171,9 @@
         callback();
       }
       return {
+        remindOptionsCopy: [],//提升医生预约居民 - 标准模板
+        formOptionsCopy: [], //量表 - 标准模板
         isSelectCartoon: false,
-//        followResourceId: '',
-//        pushDay: '',
-//        remindDay: '',
         timeFormRules: {
           timeNo: [{ required: true, message: '请添加随访时间', trigger: 'change' },{ validator: checkDay, trigger: 'blur' }],
           timeUnit: [{ required: true, message: '请添加随访时间', trigger: 'change' }],
@@ -126,13 +190,44 @@
       remindOptions:Array,
       pushTimeOptions:Array,
       formOptions: Array,
-      patientIdList: Array
+      patientIdList: Array,
+      isStandedTemplate: Boolean,
     },
     watch: {
-//      timeForm(val){
-//        this.timeForm = val
-//        console.log('表单子组件监听到的form数据',this.timeForm)
-//      },
+      timeForm(val){
+        this.timeForm = val
+        if(this.isStandedTemplate){
+          console.log('表单子组件监听到的form数据',this.timeForm)
+          this.timeForm.isDisabled = true
+          if(this.timeForm.remindList.length > 0){// remindDay
+            this.remindOptionsCopy = this.timeForm.remindList
+            this.timeForm.remindDay = []
+            this.timeForm.remindList.forEach((item)=>{
+              this.timeForm.remindDay.push(item.startDays)
+            })
+          }
+          if(this.timeForm.pushContentList.length > 0){//pushDay
+            let pushData = this.timeForm.pushContentList[0]
+            this.timeForm.pushDay = pushData.startDays
+            this.timeForm.startDaysStr = pushData.startDaysStr
+            this.timeForm.comentMsg = {
+              id: pushData.resourceId,
+              header_name: pushData.sendContent
+            }
+            this.closeSelectCartoon({
+              closeStatus: false,
+              hasSelected: this.timeForm.comentMsg
+            })
+          }
+          if(this.timeForm.followupList.length > 0){ //followResourceId
+            this.formOptionsCopy = this.timeForm.followupList
+            this.timeForm.followResourceId = []
+            this.timeForm.followupList.forEach((item)=>{
+              this.timeForm.followResourceId.push(item.startDays)
+            })
+          }
+        }
+      },
        valBegin(val){
          if(val){
            this.$refs[this.timeForm.formRef].validate((valid) => {
@@ -142,7 +237,6 @@
        },
       saveValiedBegin(val){
         console.log('保存按钮子组件的校验',val)
-        console.log(this.timeForm.formRef)
         if(val && this.timeForm.formRef){
           this.$refs[this.timeForm.formRef].validate((valid) => {
             console.log('告诉父组件，校验结果' + valid)
@@ -179,14 +273,14 @@
         return formName;
       },
       goSelectCartoon() {
-        this.isSelectCartoon = true;
+          this.isSelectCartoon = true;
       },
       closeSelectCartoon(val) {
         this.isSelectCartoon = val.closeStatus;
         this.timeForm.hasSelected = val.hasSelected;
       },
       deleteClick() {
-        this.timeForm.hasSelected = '';
+          this.timeForm.hasSelected = '';
       },
       pushConmentMsg(val){
         this.timeForm.comentMsg = val
@@ -194,8 +288,8 @@
           patientIdList: this.patientIdList
         }).then(res=>{
           if(res.code=='000000'){
-            this.timeForm.wechatPatientNum = res.data.wechatPatientNum
-            this.timeForm.messagePatientNum = res.data.messagePatientNum
+            this.timeForm.wechatPatientNum = res.data.wechatPatientNum;
+            this.timeForm.messagePatientNum = res.data.messagePatientNum;
             this.timeForm.totalNumber = this.timeForm.wechatPatientNum + this.timeForm.messagePatientNum
           }else{
             this.$notify.success({

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

@@ -29,6 +29,7 @@
         >
           <set-time-form
             v-if="index == activeTab"
+            :isStandedTemplate="isStandedTemplate"
             :timeForm="timeFormHas"
             :valBegin="valBegin"
             :saveValiedBegin="saveValiedBegin"
@@ -99,6 +100,7 @@
       setTimeNodeList: Array,
       patientIdList: Array,
       checkForm: Boolean,
+      isStandedTemplate: Boolean,
     },
     computed: {
       ...mapState('planManage',{
@@ -119,12 +121,27 @@
         }
       },
     },
+    created() {
+      this.initNewForm();
+      this.getConstData()
+      console.log(this.isStandedTemplate)
+      if(this.isStandedTemplate){
+        this.deleteAddNode()
+      }else{
+        //初始化一个随访时间节点
+        this.activeTab = 'setNewRef';
+        this.timeForm.formRef = this.getNowTime();
+      }
+    },
     watch: {
       setTimeNodeList(val){
         this.setTimeNodeList = val
         if(this.setTimeNodeList.length>0) {
-          this.timeForm.isDisabled = true;
-          this.timeForm.timeUnit = this.setTimeNodeList[0].timeUnit;
+          console.log(this.timeForm)
+          if(this.timeForm){
+            this.timeForm.isDisabled = true;
+            this.timeForm.timeUnit = this.setTimeNodeList[0].timeUnit;
+          }
         }
       },
       checkForm(val){
@@ -157,14 +174,6 @@
 //        this.setTimeNodeList1 = this.sortKey(this.setTimeNodeList,'timeNo')
       },
     },
-    created() {
-      this.initNewForm();
-      this.getConstData()
-      //初始化一个随访时间节点
-      this.activeTab = 'setNewRef';
-      this.timeForm.formRef = this.getNowTime();
-      console.log(this.timeForm.formRef)
-    },
     methods: {
       ...mapActions('planManage', [
         'getDateUnit',
@@ -304,7 +313,7 @@
       // 初始化新的表单
       initNewForm(){
         const timeFormInit = {
-          formRef: '',
+          formRef: this.getNowTime(),
           type: '',//随访方式
           timeNo: '',//随访时间
           timeUnit: '',//随访时间单位

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

@@ -81,6 +81,7 @@
       <div class="edit-plan-content" v-if="activeTab === 'second'">
         <set-time-node
           ref="getTimeNodeList"
+          :isStandedTemplate="isStandedTemplate"
           :setTimeNodeList="setTimeNodeList"
           @setTimeNodeListOnCom="setTimeNodeListOnCom"
           :patientIdList="baseInfo.patientIdList"
@@ -97,7 +98,7 @@
       @sureSelectPatient="sureSelectPatient(arguments)"
     />
     <has-selected-patient
-      :isShowSelectedDialog="isShowSelectedDialog"
+      v-if="isShowSelectedDialog"
       :hasSelectedList="hasSelectedList"
       @closeSelectedDialog="closeSelectedDialog"
       @continueAdd="continueAdd"
@@ -110,7 +111,7 @@
   import SelectPatient from '@/views/followup/plan-manage/dialog/select-patient';
   import HasSelectedPatient from '@/views/followup/plan-manage/dialog/has-selected-patient';
   import SetTimeNode from '@/views/followup/plan-manage/dialog/set-time-node';
-  import {createFollowPlan} from '@/utils/followup/followapis'
+  import { createFollowPlan, getFollowupTableTemplate } from '@/utils/followup/followapis'
 
   import { mapState, mapActions } from 'vuex'
   export default {
@@ -123,6 +124,8 @@
     },
     data() {
       return {
+        isStandedTemplate: false, // 是否是固定的随访模板
+        standedTimeNodeList: [], // 如果是国定随访模板，获取固定数据后不可更改，只读
         checkForm: false,
         /*面包屑配置*/
         curmbFirst: '随访管理',
@@ -278,6 +281,17 @@
           }
           if (valid) {
             // this.$refs['statusForm'].resetFields();
+            console.log('当前选择的随访模板id为',this.baseInfo.resourceId)
+            if(this.baseInfo.resourceId){
+              this.isStandedTemplate = true
+              getFollowupTableTemplate(this.baseInfo.resourceId).then(res=>{
+                this.standedTimeNodeList = res.data
+                this.getTimeNodeList(this.standedTimeNodeList)
+              })
+            }else{
+              this.isStandedTemplate = false
+            }
+
             this.activeTab = 'second';
           } else {
             return false;
@@ -288,6 +302,12 @@
         this.activeTab = 'first';
       },
     },
+
+    beforeRouteLeave (to, from, next) {
+      // 离开页面，需要清除缓存的时间节点
+      this.getTimeNodeList([])
+      next()
+    },
   }
 </script>
 <style lang="scss" scoped>

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

@@ -66,14 +66,14 @@
           <div class="content-div">
             <div class="c-title">推送患教：</div>
             <div class="c-content more-content" v-for="item in nodeContent[0].pushContentList">
-              <p>{{item.startDaysStr}} <span class="click-text" >《{{item.sendContent}}》</span></p>
+              <p>{{item.startDaysStr}} <span class="click-text" @click="goToShort(item.resourceUrl)">《{{item.sendContent}}》</span></p>
               <p class="reminding">推送规则：优先微信推送，如果居民没关注云鹊医公众号，将短信推送，短信推送会消耗您的额度。推送详情请前往云鹊医app患教中心查询</p>
             </div>
           </div>
           <div class="content-div">
             <div class="c-title">随访登记表：</div>
             <div class="c-content more-content">
-              <p  class="click-text" v-for="item in nodeContent[0].followupList" >{{item.sendContent}}</p>
+              <p  class="click-text" v-for="item in nodeContent[0].followupList" @click="goToShort(item.resourceUrl)">{{item.sendContent}}</p>
             </div>
           </div>
         </div>
@@ -129,7 +129,7 @@
         this.showFollowTime = true
       },
       goToResidentList() {
-        this.$router.push({path: '/followup/plan-manage/resident-list', query: {planId: this.$route.query.planId}})
+        this.$router.push({path: '/followup/plan-manage/resident-list', query: {planId: this.$route.query.planId, planName: this.planDetail.name}})
       },
       changePlan() {
         this.$router.push({path: '/followup/plan-manage/plan-modify', query: {planId: this.$route.query.planId}})
@@ -137,6 +137,9 @@
       closeFollowTime(isShow) {
         this.showFollowTime = isShow
       },
+      goToShort(url) {
+        window.open(url)
+      },
     },
     watch: {
       planDetail(val) {

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

@@ -167,7 +167,7 @@
         this.$router.push({path: '/followup/plan-manage/plan-detail', query: {planId:row.id}})
       },
       visitRow(row){
-        this.$router.push({path: '/followup/plan-manage/resident-list', query: {planId:row.id}})
+        this.$router.push({path: '/followup/plan-manage/resident-list', query: {planId:row.id, planName: row.name}})
       },
       changeRow(row){
         this.$router.push({path: '/followup/plan-manage/plan-modify', query: {planId:row.id}})

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

@@ -63,7 +63,7 @@
       @sureSelectPatient="sureSelectPatient(arguments)">
     </select-patient>
     <has-selected-patient
-      :isShowSelectedDialog="isShowSelectedDialog"
+      v-if="isShowSelectedDialog"
       :hasSelectedList="hasSelectedList"
       @closeSelectedDialog="closeSelectedDialog"
       @continueAdd="continueAdd" />

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

@@ -84,14 +84,14 @@
           <div class="content-div">
             <div class="c-title">推送患教：</div>
             <div class="c-content more-content" v-for="item in nodeContent.pushContentList">
-              <p>{{item.startDaysStr}} <span class="click-text" >《{{item.sendContent}}》</span></p>
+              <p>{{item.startDaysStr}} <span class="click-text" @click="goToShort(item.resourceUrl)" >《{{item.sendContent}}》</span></p>
               <p class="reminding">推送规则：优先微信推送，如果居民没关注云鹊医公众号，将短信推送，短信推送会消耗您的额度。推送详情请前往云鹊医app患教中心查询</p>
             </div>
           </div>
           <div class="content-div">
             <div class="c-title">随访登记表：</div>
             <div class="c-content more-content">
-              <p  class="click-text" v-for="item in nodeContent.followupList">{{item.sendContent}}</p>
+              <p  class="click-text" v-for="item in nodeContent.followupList" @click="goToShort(item.resourceUrl)" >{{item.sendContent}}</p>
             </div>
           </div>
         </div>
@@ -162,7 +162,8 @@
           planId: this.residentDetail.fPlanDto.id,
           patientId: this.residentDetail.patientId,
           yLabelList: this.residentDetail.labelIdList,
-          startDate:  this.residentDetail.fPlanDto.timeStr
+          startDate:  this.residentDetail.fPlanDto.timeStr,
+          planIdOld: this.residentDetail.fPlanDto.id,
         }
         this.showChangePlan = true;
       },
@@ -185,6 +186,9 @@
       closeFinishFollowup(isShow) {
         this.showFinishFollowup = isShow
       },
+      goToShort(url) {
+        window.open(url)
+      },
     },
     watch: {
       timeNodeList(val) {

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

@@ -7,7 +7,7 @@
       :jumPathThird="jumPathThird">
     </bread-crumb>
     <div class="resident-content f-main-content screenSet">
-      <p class="page-title">随访计划名称</p>
+      <p class="page-title">{{planTitle}}</p>
       <div class="search-div">
         <div class="search-input">
           <el-form :model="searchData" ref="searchData" :inline="true" :label-width="labelWidth">
@@ -117,7 +117,7 @@
             :current-page="residentList.pageNum"
             :page-sizes="[10, 20, 50, 100]"
             :page-size="residentList.pageSize"
-            :total="residentList.total">
+            :total="statusTotal">
           </el-pagination>
         </div>
       </div>
@@ -183,10 +183,12 @@
         initialPatientIdList: [], //初始居民
         showAddPatientTime: false,//是否展示添加居民选择时间
         addPatientData: {}, //选择时间数据
+        statusTotal: null, //每种状态的总数
+        planTitle: '',  //随访计划名称
       }
     },
     created() {
-
+      const vm = this;
     },
     mounted() {
       this.getResidentList({
@@ -244,7 +246,8 @@
           patientId: row.patientId,
           yLabelList: row.labelIdList||[],
           startDate:  row.time,
-          status: this.status
+          status: this.status,
+          planIdOld: this.$route.query.planId,
         }
         this.showChangePlan = true;
       },
@@ -273,7 +276,7 @@
             patientName: patientNames.join('、'),
             patientIdList: patientIds,
             title: this.status==3?'恢复随访':'结束随访',
-            reasonName: this.status==3?'恢复原因：':'结束原因：'
+            reasonName: this.status==3?'恢复原因：':'结束原因：',
           };
         } else {
           let patientIds = [];
@@ -347,8 +350,27 @@
             _this.initialPatientIdList.push(item.patientId)
           })
         }
+        if(_this.status == 1) {
+          _this.statusTotal = val.notCount
+        } else if (_this.status == 2) {
+          _this.statusTotal = val.handCount
+        } else if (_this.status == 3) {
+          _this.statusTotal = val.yesCount
+        }
 
       }
+    },
+    beforeRouteEnter(to, from, next) {
+      next(vm=> {
+        if(from.name === 'planList') {
+          vm.curmbSecond = '计划管理'
+          vm.jumPathThird = '/followUp/plan-manage'
+        } else if(from.name === 'planDetail') {
+          vm.curmbSecond = '计划详情'
+          vm.jumPathThird = `/followUp/plan-manage/plan-detail?planId=${vm.$route.query.planId}`
+        }
+        vm.planTitle = vm.$route.query.planName
+      })
     }
   }
 </script>

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

@@ -92,9 +92,14 @@
           </el-table-column>
           <el-table-column
             width="160"
-            prop="appointmentTime"
             label="随访预约时间"
             align="center">
+            <template slot-scope="scope">
+              <span v-if="scope.row.status==1" style="color: #49C688;">未完成</span>
+              <span v-else-if="scope.row.status==2">待确认</span>
+              <span v-else-if="scope.row.status==4"  style="color: #D5172E;">已拒绝</span>
+              <span v-else>{{scope.row.appointmentTime}}</span>
+            </template>
           </el-table-column>
           <el-table-column
             width="180"
@@ -247,14 +252,14 @@
         this.dialogDetailShow = true;
       },
       setSearchData() {
-        const { planName, mobilePhone, timeStatus, nickName } = this.searchData;
+        const { planName, mobilePhone, timeStatus, nickname } = this.searchData;
         let para = {}
         if(this.searchData.planTimes) {
           para = {
             planName,
             mobilePhone,
             timeStatus,
-            nickName,
+            nickname,
             beginTime: this.searchData.planTimes[0],
             endTime: this.searchData.planTimes[1],
             status: this.status
@@ -264,7 +269,7 @@
             planName,
             mobilePhone,
             timeStatus,
-            nickName,
+            nickname,
             status: this.status
           }
         }