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

src/views/layout/Layout.vue

@@ -51,7 +51,7 @@
           </div>
           <p>库存管理</p>
         </div> -->
-        <a :href="CDMWebsit()" target="_blank" v-if="this.$store.getters.xt_user.cdm_role_exist">
+        <!-- <a :href="CDMWebsit()" target="_blank" v-if="this.$store.getters.xt_user.cdm_role_exist">
           <div class="dialogMainOne">
             <div class="dialogIcon">
               <i class="iconfont icon-yiliao newIcon"></i>
@@ -66,7 +66,7 @@
             </div>
             <p>营销管理</p>
           </div>
-        </a>
+        </a> -->
         <!-- <div class="dialogMainOne">
           <div class="dialogIcon">
             <i class="iconfont icon-shujufenxi-jingyinggaikuang newIcon"></i>

src/xt_pages/dialysis/template/DialysisPrintOrderEight.vue

@@ -5,24 +5,24 @@
       <div class="order-title">{{ orgname }}&nbsp;&nbsp;&nbsp;血液净化治疗记录单</div>
       <table class="print-table" border="1" style="margin-top: 10px;">
         <tr>
-          <td style="text-align:left;">
+          <td style="text-align:left;width:170px" colspan="1">
             <span style="display:inline-block;margin-left:15px;">
               {{getDatge(queryParams.xtdate)}}
             </span>
           </td>
-          <td style="text-align:center;">
+          <td style="text-align:center;width:170px" colspan="1">
             姓名:
             <span style="display:inline-block;margin-left:10px;">
               {{patientInfo.name}}
             </span>
           </td>
-          <td style="text-align:center;">
+          <td style="text-align:center;" colspan="1">
             性别:
             <span style="display:inline-block;margin-left:10px;">
               {{patientInfo.gender}}
             </span>
           </td>
-          <td style="text-align:center;">
+          <td style="text-align:center;" colspan="1">
             年龄:
             <span style="display:inline-block;margin-left:10px;">
               {{
@@ -30,7 +30,7 @@
               }}
             </span>
           </td>
-          <td style="text-align:center;">
+          <td style="text-align:center;" colspan="1">
             <label-box
               showValue="门诊"
               :isChecked="receiverTreatmentAccess.condition == 2 ? true : false"
@@ -40,7 +40,7 @@
               :isChecked="receiverTreatmentAccess.condition == 1 ? true : false"
             ></label-box>
           </td>
-          <td style="text-align:center;">
+          <td style="text-align:center;" colspan="1">
             <template v-if="receiverTreatmentAccess.condition == 1">
               住院号:
               <span style="display:inline-block;margin-left:10px;">
@@ -62,7 +62,7 @@
               </span>
             </template>
           </td>
-          <td style="text-align:center;">
+          <td style="text-align:center;" colspan="1">
             机器号:
             <span style="display:inline-block;margin-left:10px;">
               {{
@@ -85,7 +85,7 @@
             <label-box :isChecked="prescription.mode_id == 5 ? true : false" showValue="HF"></label-box>&nbsp;
           </td>
           <td style="text-align:left;" colspan="5">
-            <span style="display:inline-block;margin-left:15px;">诊断: {{ patientInfo.diagnose }}</span>
+            <span style="display:inline-block;margin-left:15px;width:100%;">诊断: {{ patientInfo.diagnose }}</span>
           </td>
         </tr>
         <tr>

src/xt_pages/user/courseOfDisease.vue

@@ -328,7 +328,7 @@
       },
 
       createAction: function() {
-        this.new_content = this.$refs.editor.content
+        this.new_content = encodeURIComponent(this.$refs.editor.content)
         if (this.new_content.length == 0) {
           this.$message.error('请填写病程内容')
           return