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

@@ -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/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 = []
           }
         })
       },
@@ -242,15 +270,14 @@
       },
       // 选择居民
       handleSelectionChange(val) {
-        console.log('每次选中居民',val)
+//        console.log('每次选中居民',val)
         this.eachSelects = val
       },
       // 切换分页
       handleCurrentChangePre(val) {
-        console.log('handleCurrentChangePre')
-        this.getPatientsList({
-          pageNum: val
-        })
+//        console.log('handleCurrentChangePre')
+        this.paginationSet.pageNum = val
+        this.getPatientsList()
       },
       clickClose(){
         this.$emit('closeSelectPatient',false)
@@ -259,47 +286,35 @@
         this.$emit('sureSelectPatient',false,this.eachSelects)
       },
       handleSizeChangePre(val) {
-        console.log('handleSizeChangePre')
+//        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-node.vue

 <template>
   <div>
-    <p><el-button plain icon="el-icon-plus" size="small" round @click="addNewNode">新增时间节点</el-button><br></p>
+    <p><el-button plain icon="el-icon-plus" size="small" round v-if="!isStandedTemplate" @click="addNewNode">新增时间节点</el-button><br></p>
     <div class="add-time-content">
 
       <div class="time-line-scroll">
@@ -10,11 +10,11 @@
             v-for="(item, index) in setTimeNodeList1"
             :key="index"
             :label="index">开始后{{item.timeNo + item.timeUnitStr}}
-            <i class="el-icon-circle-close-outline" @click="deleteTimeNode(item, index)"></i>
+            <i class="el-icon-circle-close-outline" v-if="!isStandedTemplate" @click="deleteTimeNode(item, index)"></i>
           </el-radio-button>
           <el-radio-button
             label="setNewRef"
-            v-if="showSetBtn">设置随访时间
+            v-if="showSetBtn && !isStandedTemplate">设置随访时间
             <i class="el-icon-circle-close-outline" @click="deleteAddNode" v-if="setTimeNodeList.length>0"></i>
           </el-radio-button>
         </el-radio-group>
@@ -29,6 +29,8 @@
         >
           <set-time-form
             v-if="index == activeTab"
+            :isStandedTemplate="isStandedTemplate"
+            :planId="planId"
             :timeForm="timeFormHas"
             :valBegin="valBegin"
             :saveValiedBegin="saveValiedBegin"
@@ -46,6 +48,7 @@
       <!--新增时间节点-->
       <div class="form-div" v-if="activeTab == 'setNewRef'">
         <set-time-form
+          :planId="planId"
           :timeForm="timeForm"
           :valBegin="valBegin"
           :saveValiedBegin="saveValiedBegin"
@@ -87,7 +90,9 @@
         activeTab: null,
         currentFormRef: 1,
         showSetBtn: true,
-        timeForm: {},
+        timeForm: {
+          formRef: ''
+        },
         timeFormRules: {
           timeNo: [{ required: true, message: '请添加随访时间', trigger: 'change' }],
           timeUnit: [{ required: true, message: '请添加随访时间', trigger: 'change' }],
@@ -99,6 +104,8 @@
       setTimeNodeList: Array,
       patientIdList: Array,
       checkForm: Boolean,
+      isStandedTemplate: Boolean,
+      planId: String,
     },
     computed: {
       ...mapState('planManage',{
@@ -119,16 +126,31 @@
         }
       },
     },
+    created() {
+      this.initNewForm();
+      this.getConstData()
+    //初始化一个随访时间节点
+      this.activeTab = 'setNewRef';
+      this.timeForm.formRef = this.getNowTime();
+
+    },
     watch: {
       setTimeNodeList(val){
         this.setTimeNodeList = val
         if(this.setTimeNodeList.length>0) {
+          if(this.timeForm){
             this.timeForm.isDisabled = true;
             this.timeForm.timeUnit = this.setTimeNodeList[0].timeUnit;
+//            console.log(this.isStandedTemplate)
+            if(this.isStandedTemplate || this.planId){
+              this.deleteAddNode()
+            }
           }
+        }
+
       },
       checkForm(val){
-        console.log('触发 保存 校验',val)
+//        console.log('触发 保存 校验',val)
         // 触发 保存 校验
         this.saveValiedBegin = val
 
@@ -139,7 +161,7 @@
           this.timeForm.timeUnit = this.setTimeNodeList[0].timeUnit;
         }
         this.timeForm = val
-        console.log('表单父组件的数据',this.timeForm)
+//        console.log('表单父组件的数据',this.timeForm)
       },
       setTimeNodeList1(val) {
         if(val.length > 0){
@@ -157,14 +179,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',
@@ -207,6 +221,8 @@
               this.$emit('addListenSave',false)
             }
           }else{
+            // 不是固定模板
+            if(!this.isStandedTemplate){
               if(this.timeForm.remindDay.length>0){
                 this.timeForm.remindDay.forEach((item)=>{
                   this.timeForm.remindList.push({
@@ -214,6 +230,7 @@
                   })
                 })
               }
+              console.log(this.timeForm)
               console.log(this.timeForm.followResourceIdStr)
               if(this.timeForm.pushDay){
                 this.timeForm.pushContentList.push({
@@ -244,6 +261,13 @@
                 this.timeForm.formRef = this.getNowTime();
                 this.timeForm.isDisabled = true;
               }
+            }else{// 是固定模板
+              // 只能保存提交
+//              this.setTimeNodeList.push(this.timeForm);
+              this.$emit('setTimeNodeListOnCom',this.setTimeNodeList)
+              this.$emit('addListenSave',true)
+            }
+
           }
 
           // 校验没通过
@@ -257,7 +281,7 @@
       },
       // 点击 新增时间节点
       addNewNode() {
-        console.log('是否新增一个新的时间节点  ' + (this.activeTab == 'setNewRef'))
+//        console.log('是否新增一个新的时间节点  ' + (this.activeTab == 'setNewRef'))
         this.checkTimeIsRepeat()
         if(this.timeIsRepeat){
           this.$notify.success({
@@ -281,8 +305,6 @@
       // 验证是否重复
       checkTimeIsRepeat(){
         this.timeIsRepeat = false;
-        console.log('+++',this.setTimeNodeList)
-        console.log('+++',this.timeForm.timeNo)
         if(this.setTimeNodeList.length > 0){
           if(this.showSetBtn){
             this.setTimeNodeList.forEach(item=>{
@@ -304,7 +326,7 @@
       // 初始化新的表单
       initNewForm(){
         const timeFormInit = {
-          formRef: '',
+          formRef: this.getNowTime(),
           type: '',//随访方式
           timeNo: '',//随访时间
           timeUnit: '',//随访时间单位
@@ -336,9 +358,8 @@
         this.timeForm.hasSelected = '';
       },
       changeTab(val){
-        this.activeTab = val;
-
         console.log('当前的 activeTab ',val)
+        this.activeTab = val;
 
         if(val == 'setNewRef') {
           this.initNewForm();

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: '随访管理',
@@ -186,7 +189,7 @@
       },
       // 监听保存校验结果
       addListenSave(val){
-         console.log('监听保存校验结果',val)
+//         console.log('监听保存校验结果',val)
         this.checkForm = false
          if(val){
            this.baseInfo.fPlanTimeReqList = this.setTimeNodeList
@@ -216,7 +219,7 @@
 //        console.log('保存setTimeNodeList1',this.$refs.getTimeNodeList.setTimeNodeList1)
 //        console.log('store中的setTimeNodeList数据为=>',JSON.stringify(this.setTimeNodeList))
          }else{
-           console.log('点击保存按钮之后校验失败')
+//           console.log('点击保存按钮之后校验失败')
          }
       },
       setTimeNodeListOnCom(val){
@@ -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-modify.vue

@@ -49,9 +49,11 @@
       </el-form>
       <div class="edit-plan-content">
         <set-time-node
+          :isStandedTemplate="isStandedTemplate"
           :setTimeNodeList="setTimeNodeList"
           @setTimeNodeListOnCom="setTimeNodeListOnCom"
           :checkForm="checkForm"
+          :planId="planId"
           @addListenSave="addListenSave"
         />
       </div>
@@ -63,7 +65,7 @@
       @sureSelectPatient="sureSelectPatient(arguments)">
     </select-patient>
     <has-selected-patient
-      :isShowSelectedDialog="isShowSelectedDialog"
+      v-if="isShowSelectedDialog"
       :hasSelectedList="hasSelectedList"
       @closeSelectedDialog="closeSelectedDialog"
       @continueAdd="continueAdd" />
@@ -92,6 +94,9 @@
     },
     data() {
       return {
+        planId: '',
+        isStandedTemplate: false, // 是否是固定的随访模板
+        standedTimeNodeList: [], // 如果是国定随访模板，获取固定数据后不可更改，只读
         checkForm: false,
         patientIdList: [], //获取的病人列表
         hasSelectedList: [], //已选居民
@@ -257,11 +262,17 @@
     },
     watch: {
       planDetail(val) {
+//        console.log(val)
        // this.setTimeNodeList = val.fPlanTimeDtoList
         this.setTimeNodeListOnCom(val.fPlanTimeReqList)
-        console.log(val)
+//        console.log(this.setTimeNodeList)
         this.patientIdList = val.patientIdList
-//        this.hasSelectedList =
+        this.planId = String(val.id)
+        if(val.resourceId){
+          this.isStandedTemplate = true
+        }else{
+          this.isStandedTemplate = false
+        }
       },
     }
   }

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

@@ -169,11 +169,13 @@
           pageNo: currentPage || this.paginationSet.pageNo,
           pageSize: this.paginationSet.pageSize,
         });
+        if(this.recordList.enteringDtos){
           if(this.recordList.enteringDtos.length > 0) {
             this.hasData = true;
           }else {
             this.hasData = false;
           }
+        }
         const {pageNo, pageSize, count, finishedCount, unfinishedCount} = this.recordList;
         if(this.activeName == ''){
           this.paginationSet.total = count;
@@ -237,8 +239,8 @@
         this.isShowChangeDialog = true;
       },
       sendRow(row){
-        // let saasUrl = getSaasDomain(`/pica-frontend/patientEduManage/pica_patient_edu_manage.html#/pageTab/message?patientId=${row.patientId}&token=D74A6C7C61564EB1B3DC83251F33D173`);
-        let saasUrl = getSaasDomain(`/pica-frontend/patientEduManage/pica_patient_edu_manage.html#/pageTab/message?patientId=${row.patientId}&token=${this._token}`);
+        let saasUrl = getSaasDomain(`/pica-frontend/patientEduManage/pica_patient_edu_manage.html#/pageTab/message?patientId=${row.patientId}&nickname=${row.nickname}&token=${this._token}`);
+        // let saasUrl = getSaasDomain(`/pica-frontend/patientEduManage/pica_patient_edu_manage.html#/pageTab/message?patientId=${row.patientId}&nickname=${row.nickname}&token=8143DC2A026B4602BF7B746FB5AEE9A1`);
         window.open(saasUrl)
       },
       handleSizeChangePre(pageSize){

src/views/followup/reservation-manage/dialog/send-reservation.vue

@@ -53,7 +53,7 @@
         </div>
         <div class="item">
           <span class="title">本次推送:</span>
-          <p>{{checkData.sendWechatAppointSize + checkData.sendMobileAppointSize}}条（微信不限额推送{{checkData.sendWechatAppointSize}}条；使用短信额度推送{{checkData.sendMobileAppointSize}}条）</p>
+          <p>{{checkData.sendWechatAppointSize + checkData.sendMobileSmsCount}}条（微信不限额推送{{checkData.sendWechatAppointSize}}条；使用短信额度推送{{checkData.sendMobileSmsCount}}条）</p>
         </div>
         <div class="item">
           <span class="title">推送成功后剩余额度:</span>