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/components/followup/form/index.vue

@@ -116,14 +116,16 @@
             v-for="(itemChild, indexChild) in form[item.model]"
             :key="indexChild"
             style="margin-bottom: 15px;font-size:18px;color:#606266;">
-            <span>{{itemChild.medicinesName}}：</span>
-            <span>每日{{itemChild.dosageDay}}次，</span>
-            <span>每次{{itemChild.dosageNum}}粒</span>
-            <el-button
-              type="plain"
-              icon="el-icon-delete"
-              class="margin-left-20"
-              @click="clickDeleteFunc(form[item.model], indexChild)">删除</el-button>
+            <el-col :span="24">
+              <span>{{itemChild.medicinesName}}：</span>
+              <span>每日{{itemChild.dosageDay}}次，</span>
+              <span>每次{{itemChild.dosageNum}}</span>
+              <el-button
+                type="plain"
+                icon="el-icon-delete"
+                class="margin-left-20"
+                @click="clickDeleteFunc(form[item.model], indexChild)">删除</el-button>
+            </el-col>
           </el-row>
         </el-form-item>
       </el-col>

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

@@ -16,7 +16,7 @@ export default ($this) => {
       model: 'arrList',
       label: '',
       disabled: true,
-      spanNum: 12,
+      spanNum: 24,
       rules: [{required: false, message: '', trigger: ['submit','change']}],
       clickDeleteFunc: () => {
       }