Merge branch 'dev-scaleHype-20190428' of...

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

src/views/followup/record-manage/models/diabetes/diabetesSourseOther.js

@@ -39,7 +39,7 @@ export default ($this) => {
       model: 'remark',
       disabled: false,
       placeholder: '请输入不良反应',
-      spanNum: 12,
+      spanNum: 24,
       maxlength: 30,
       type: 'text',
       labmsg: '',

src/views/followup/record-manage/patient-scale/diabetes.vue

@@ -69,6 +69,7 @@
         formData: {},//整个表单对象
         dialogFormVisible: false,//是否显示添加用药情况dialog
         medication: [],// 用药情况
+        type2Obj: {},
       }
     },
     components: {
@@ -90,9 +91,6 @@
             // 将每个模块的fornName对应后台的表名放到表单对象
             this.formData[formName] = this.addComponents[i].formObject;
 
-            // if(formName==='stroke_006'||formName==='stroke_014'||formName==='stroke_015'){
-            //   this.setRuleToTrue(i)
-            // }
             this.$nextTick(()=>{
               // saveWay=1是提交，进行校验，2是暂存，不需要校验，直接发送请求
               if(this.saveWay==1){
@@ -235,40 +233,39 @@
           }
         })
       },
+      // 处理获取用药情况详情数据
+      handleModuleMedicalUseData(obj){
+        if(obj.medicineType == '1'){
+          const { dosageDay,dosageNum,medicinesName,medicineType } = obj;
+          this.medication.push({ dosageDay,dosageNum,medicinesName,medicineType });
+        }else if(obj.medicineType == '2'){
+          const { dosageDay,dosageNum,medicinesName,medicineType } = obj;
+          this.type2Obj = { dosageDay,dosageNum,medicinesName,medicineType }
+        }
+      },
       // 获取量表详情
       getFormDetail(){
         getScaleDetail(this.domain,this.planPatientsTimesId,this.scaleNo).then(res=>{
           this.formData = res.data
           let keysList = Object.keys(this.formData);
           if(keysList.length > 0){
+            this.medication = [];
             for(let i=0;i<this.addComponents.length;i++){
               let formName = this.addComponents[i].formName;
+              // let type2Obj = {};
               if(this.formData[formName] && formName == 'h_s_002'){
-                this.medication = [];
-                let type3Obj = {};
-                this.formData['h_s_002'].forEach((item,index)=>{
-                  if(item.medicineType=='1'){
-                    this.medication.push({
-                      dosageDay: item.dosageDay,
-                      dosageNum: item.dosageNum,
-                      medicinesName: item.medicinesName,
-                      medicineType: item.medicineType
-                    })
-                  }else if(item.medicineType=='2'){
-                    type3Obj = {
-                      dosageDay: item.dosageDay,
-                      dosageNum: item.dosageNum,
-                      medicinesName: item.medicinesName,
-                      medicineType: item.medicineType
-                    }
-
-                  }
-                })
+                let getDataHS002 = this.formData[formName];
+                if(Array.isArray(getDataHS002)){
+                  getDataHS002.forEach((item,index)=>{
+                    this.handleModuleMedicalUseData(item);
+                  })
+                }else {
+                  // 如果是对象，则为一条数据
+                  this.handleModuleMedicalUseData(getDataHS002);
+                }
                 this.addComponents[i].formObject = {
                   arrList: this.medication,
-                  dosageDay: type3Obj.dosageDay,
-                  dosageNum: type3Obj.dosageNum,
-                  medicinesName: type3Obj.medicinesName
+                  ...this.type2Obj
                 }
               }else if(this.formData[formName] && formName == 'diabetes_001'){
                 this.addComponents[i].formObject = this.formData[formName];
@@ -299,12 +296,14 @@
         this.formData.isLine = 2;
         this.formData.diabetes_001.symptom = JSON.stringify(this.formData.diabetes_001.symptom);
         let arrNew = [];
-        arrNew.push({medicineType: '2', medicinesName:this.formData.h_s_002.medicinesName, dosageDay: this.formData.h_s_002.dosageDay, dosageNum:this.formData.h_s_002.dosageNum });
-        this.formData.h_s_002 = this.medication.concat(arrNew);
-        // if(this.formData.h_s_002.length <= 1){
-        //   this.formData.h_s_002.push()
-        // }
-        // console.log('用药情况',this.formData.h_s_002)
+        arrNew.push({
+          medicineType: '2',
+          medicinesName:this.formData.h_s_002.medicinesName,
+          dosageDay: this.formData.h_s_002.dosageDay,
+          dosageNum:this.formData.h_s_002.dosageNum
+        });
+        this.medication = [...this.medication,...arrNew];
+        this.formData.h_s_002 = this.medication
         postScale(this.domain,this.formData).then(res=>{
           if(res.code=='000000'){
             let doMsg = (this.saveWay==1) ? '提交成功' : '保存成功';