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/recordManage.js

-import {getEnteringList, getEnteringInfo} from '../../utils/followup/followapis'
+import {getEnteringList, getEnteringInfo, getFormList} from '../../utils/followup/followapis'
 
 export default {
   namespaced: true,
@@ -6,6 +6,7 @@ export default {
     recordList: {}, //录入列表
     enteringInfo: {}, //单条信息查看
     constantsData: {},//获取常量
+    formList: [], //获取量表列表
   },
   mutations: {
     GET_RECORD_LIST(state, payload) {
@@ -17,6 +18,9 @@ export default {
     GET_CONSTANS_DATA(state, payload) {
       state.constantsData = payload
     },
+    GET_FORM_LIST(state, payload) {
+      state.formList = payload
+    },
   },
   actions: {
     async getRecordList(context, payload) {
@@ -31,14 +35,11 @@ export default {
         context.commit('GET_ENTERING_INFO', data);
       });
     },
-    // async getConstantsData(context, payload) {
-    //   await followApi.getBasicData({
-    //     ...payload
-    //   }).then(({data}) => {
-    //     context.commit('GET_CONSTANS_DATA', data)
-    //   })
-
-    // },
+    getFormList(context, payload) {
+      getFormList(payload).then(({data}) => {
+        context.commit('GET_FORM_LIST',data)
+      })
+    }
 
   },
 }

src/utils/followup/followapis.js

@@ -199,6 +199,15 @@ export const getEnteringInfo = (patientId, fuPlanPatientTimesId) => {
     description: '随访单条信息查看',
   },)
 }
+export const getFormList = (planTimesId) => {
+  return fetch({
+    headers,
+    url: getFollowUpSC(`/followup/entering/scale/${planTimesId}/list`),
+    method: 'get',
+    // params: params,
+    description: '获取量表列表',
+  },)
+}
 
 //获取新建计划居民列表
 export const getPlanPatientsList = (data) =>{

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

@@ -56,6 +56,7 @@
               v-model="baseInfo.time"
               type="date"
               placeholder="请选择随访开始时间"
+              :picker-options="pickerOptions"
               clearable
               style="width:380px;">
             </el-date-picker>
@@ -152,6 +153,11 @@
           resourceId: [{ required: true, message: '请选择随访模板', trigger: 'change' }],
           time: [{ required: true, message: '请选择随访开始时间', trigger: 'change' }],
         },
+        pickerOptions: {
+          disabledDate(time) {
+            return time.getTime() < Date.now() - 8.64e7
+          }
+        }
       }
     },
     created() {

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

@@ -84,7 +84,18 @@
         </div>
       </div>
       <followup-detail :dialogFormVisible="dialogDetailShow" @closeDetail="closeDetail" :enteringInfo="enteringInfo"></followup-detail>
-      <change-followup-status :isShowChangeDialog="isShowChangeDialog" :statusForm="statusForm" @closeChangeStatus="closeChangeStatus()"></change-followup-status>
+      <change-followup-status :isShowChangeDialog="isShowChangeDialog" :statusForm="statusForm" @closeChangeStatus="closeChangeStatus"></change-followup-status>
+      <el-dialog title="选择量表"
+                 :visible.sync="selectFormShow"
+                 center
+                 :close-on-click-modal="false"
+                 :close-on-press-escape="false"
+                 width="400px"
+                 :before-close="closeForm">
+        <div class="list-content">
+          <p v-for="(item, index) in formList" :key="index" @click="goFormView(item)">{{item.sendContent}}</p>
+        </div>
+      </el-dialog>
     </div>
 </template>
 
@@ -125,15 +136,14 @@
         dialogDetailShow: false,
         isShowChangeDialog: false,
         hasData: false,
+        selectFormShow: false,
       }
     },
     computed: {
-      // ...mapState('reservationManage',{
-      //   constantsData: state => state.constantsData,
-      // }),
       ...mapState('recordManage',{
         recordList: state => state.recordList,
         enteringInfo: state => state.enteringInfo,
+        formList: state => state.formList,
       }),
       ...mapGetters([
         '_token',
@@ -142,14 +152,9 @@
     created() {
       this.search(1);
     },
-    mounted() {
-      // this.getConstantsData({
-      //   numList: 'P216'
-      // })
-    },
+    mounted() {},
     methods: {
-      // ...mapActions('reservationManage', ['getConstantsData']),
-      ...mapActions('recordManage', ['getRecordList', 'getEnteringInfo']),
+      ...mapActions('recordManage', ['getRecordList', 'getEnteringInfo', 'getFormList']),
       async search(currentPage){
         if(this.timeRangeList) {
           this.searchData.beginTime = this.timeRangeList[0];
@@ -205,12 +210,27 @@
         this.search(1);
       },
       editRow(row){
-        this.$router.push({
-          name: 'formTemplate',
-          params: {
-            data: row
-          }
-        })
+        this.getFormList(row.fuPlanTimesId); //获取量表列表
+        //获取量表列表情况
+        if(this.formList.length > 1){
+          this.selectFormShow = true
+        }else if(this.formList.length === 1){
+          this.$router.push({
+            name: 'formTemplate',
+            params: {
+              data: formList[0]
+            }
+          })
+        }else {
+          this.$message.warning('暂不支持录入量表!')
+        }
+      //  不区分量表列表长度问题，直接调试量表录入
+      //   this.$router.push({
+      //     name: 'formTemplate',
+      //     params: {
+      //       data: row
+      //     }
+      //   })
       },
       changeStatusRow(row){
         this.statusForm = row;
@@ -237,6 +257,18 @@
         // this.isShowChangeDialog = getArguments[0];
         // this.statusForm = getArguments[1];
       },
+      goFormView(item) {
+        this.selectFormShow = false
+        this.$router.push({
+          name: 'formTemplate',
+          params: {
+            data: item
+          }
+        })
+      },
+      closeForm() {
+        this.selectFormShow = false;
+      },
     },
     filters: {
       statusFileter: function(value) {
@@ -271,30 +303,13 @@
       color: $picaGreen;
     }
   }
-  /*.form-content{
-    .item-div{
-      display: flex;
-      align-items: center;
-      color: #606266;
-      min-height: 40px;
-      font-size: 14px;
-      &.textarea-add{
-        align-items: flex-start;
-        margin-top: 20px;
-      }
-      .left-title{
-        width: 120px;
-        text-align: right;
-        padding-right: 12px;
-      }
-      .right-item{
-        flex: 1;
-      }
-      .required-mark{
-        color: #F56C6C;
-        margin-right: 3px;
-      }
+  .list-content{
+    p{
+      cursor: pointer;
+      line-height: 30px;
+      text-decoration: underline;
+      color: $picaGreen;
     }
-  }*/
+  }
 }
 </style>