Merge branch '20201109_pc_vue_new_branch' of http://git.shengws.com/csx/Vue_New into 20201109_pc_vue_new_branch

src/xt_pages/dialysis/template/DialysisPrintOrderSeventeen.vue

@@ -1465,7 +1465,7 @@ export default {
           this.afterdialysis = afterdialysis
           // eslint-disable-next-line no-unused-vars
           var doctoradvce = response.data.data.doctorAdvice
-          var doctorAdevieInfo = response.data.data.doctorAdevieInfo
+          var doctorAdevieInfo = response.data.data.advices
           this.newTableAdvice = response.data.data.doctorAdevieInfo
           console.log('哈哈哈哈哈哈哈哈哈', this.newTableAdvice)
           var tableAdvice = doctorAdevieInfo

src/xt_pages/dialysis/template/DialysisPrintOrderTwentySeven.vue

@@ -506,6 +506,13 @@
                   </tr>
                 </tbody>
               </table>
+              <table class="table-box">
+                <tbody>
+                  <tr>
+                    <td style="text-align:left;padding-left:5px;">备注:{{ predialysis.remark ? predialysis.remark : '' }}</td>
+                  </tr>
+                </tbody>
+              </table>
             </td>
           </tr>
         </tbody>