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

@@ -6,7 +6,7 @@ export default {
     recordList: {}, //录入列表
     enteringInfo: {}, //单条信息查看
     constantsData: {},//获取常量
-    formList: [], //获取量表列表
+    formList: {}, //获取量表列表
   },
   mutations: {
     GET_RECORD_LIST(state, payload) {
@@ -35,8 +35,8 @@ export default {
         context.commit('GET_ENTERING_INFO', data);
       });
     },
-    getFormList(context, payload) {
-      getFormList(payload).then(({data}) => {
+    async getFormList(context, payload) {
+      await getFormList(payload).then(({data}) => {
         context.commit('GET_FORM_LIST',data)
       })
     }

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

@@ -94,7 +94,7 @@
                  width="400px"
                  :before-close="closeForm">
         <div class="list-content">
-          <p v-for="(item, index) in formList" :key="index" @click="goFormView(item)">{{item.sendContent}}</p>
+          <p v-for="(item, index) in formList.scalesList" :key="index" @click="goFormView(item)">{{item.sendContent}}</p>
         </div>
       </el-dialog>
     </div>
@@ -213,18 +213,18 @@
       handlerClick(){
         this.search(1);
       },
-      editRow(row){
-        this.getFormList(row.fuPlanTimesId); //获取量表列表
+      async editRow(row){
+        await this.getFormList(row.fuPlanTimesId); //获取量表列表
         //获取量表列表情况
-        if(this.formList.length > 1){
+        if(this.formList.scalesList.length > 1){
           this.selectFormShow = true
           this.ScaleData = {
             doctorId: row.doctorId,
-            scaleNo: row.planPatientTimesId
+            planPatientsTimesId: row.fuPlanTimesId
           }
-        }else if(this.formList.length === 1){
+        }else if(this.formList.scalesList.length === 1){
           this.$router.push({path: '/followup/record-manage/form-template',
-            query: {doctorId: row.doctorId, scaleNo: item.resourceId, planPatientsTimesId: row.planPatientTimesId}})
+            query: {doctorId: this.formList.doctorId, scaleNo: this.formList.scalesList[0].resourceId, planPatientsTimesId: row.fuPlanTimesId}})
         }else {
           this.$message.warning('暂不支持录入量表!')
         }
@@ -264,7 +264,7 @@
       goFormView(item) {
         this.selectFormShow = false
         this.$router.push({path: '/followup/record-manage/form-template',
-          query: {doctorId: this.ScaleData.doctorId, scaleNo: item.resourceId, planPatientsTimesId: this.ScaleData.planPatientTimesId}});
+          query: {doctorId: this.ScaleData.doctorId, scaleNo: item.resourceId, planPatientsTimesId: this.ScaleData.fuPlanTimesId}});
       },
       closeForm() {
         this.selectFormShow = false;

src/views/home.vue

@@ -80,7 +80,7 @@
                    width="400px"
                    :before-close="closeForm">
           <div class="list-content">
-            <p v-for="(item, index) in formList" :key="index" @click="goFormView(item)">{{item.sendContent}}</p>
+            <p v-for="(item, index) in formList.scalesList" :key="index" @click="goFormView(item)">{{item.sendContent}}</p>
           </div>
         </el-dialog>
     </div>
@@ -206,23 +206,23 @@ export default {
         goFormView(item) {
           this.selectFormShow = false
           this.$router.push({path: '/followup/record-manage/form-template',
-            query: {doctorId: this.ScaleData.doctorId, scaleNo: item.resourceId, planPatientsTimesId: this.ScaleData.planPatientTimesId}});
+            query: {doctorId: this.ScaleData.doctorId, scaleNo: item.resourceId, planPatientsTimesId: this.ScaleData.planPatientsTimesId}});
         },
         closeForm() {
           this.selectFormShow = false;
         },
-        goToScale(row) {
-          this.getFormList(row.planPatientTimesId); //获取量表列表
+        async goToScale(row) {
+          await this.getFormList(row.plantimesId); //获取量表列表
           //获取量表列表情况
-          if(this.formList.length > 1){
+          if(this.formList.scalesList.length > 1){
             this.selectFormShow = true
             this.ScaleData = {
               doctorId: row.doctorId,
-              scaleNo: row.planPatientTimesId
+              planPatientsTimesId: row.plantimesId
             }
-          }else if(this.formList.length === 1){
+          }else if(this.formList.scalesList.length === 1){
             this.$router.push({path: '/followup/record-manage/form-template',
-              query: {doctorId: row.doctorId, scaleNo: item.resourceId, planPatientsTimesId: row.planPatientTimesId}})
+              query: {doctorId: this.formList.doctorId, scaleNo: this.formList.scalesList[0].resourceId, planPatientsTimesId: row.plantimesId}})
           }else {
             this.$message.warning('暂不支持录入量表!')
           }