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/dialysisPrintOrder.vue

@@ -1037,11 +1037,11 @@
           >
           </DialysisPrintOrderFortySeven>
 
-           <DialysisPrintOrderFortyTwo
+           <DialysisPrintOrderFortyEight
             v-bind:childResponse="childResponse"
             v-if="org_template_info.template_id == 48"
           >
-          </DialysisPrintOrderFortyTwo>
+          </DialysisPrintOrderFortyEight>
 
             <DialysisPrintOrderFortyNine
             v-bind:childResponse="childResponse"

src/xt_pages/dialysis/template/DialysisPrintOrderFortyTwo.vue

@@ -933,7 +933,7 @@
                       <!-- <td width="70">其他记录:</td> -->
                       <td width="85">透析小结:</td>
                       <td width="">
-                        <div style="width: 95%;line-height: 25px;text-align: left;margin-left: 2px;text-underline-position: under; text-decoration: underline;">
+                        <div style="width: 95%;line-height: 25px;text-align: left;margin-left: 2px;">
                           {{ summary.dialysis_summary }}
                         </div>
                       </td>

src/xt_pages/hospitalStation/components/chargeDialog.vue

@@ -104,9 +104,7 @@
           <el-form-item class="specialFormItem">
             <div style="display: flex">
               <!--            这里不要改成el-input，因为使用el-input会导致一个奇怪的bug，千万不要改！！！！！！！！！！！！！！！！！！！！-->
-              <el-input v-model="form.tmp_decimal" onkeyup="this.value = this.value.replace(/[^\d.]/g,'');" @change="lilili">
-              
-              </el-input>元
+              <el-input v-model="form.tmp_decimal" @onkeyup="this.value = this.value.replace(/[^\d.]/g,'');" @change="lilili">元</el-input>
             </div>
           </el-form-item>
         </span>
@@ -389,4 +387,9 @@ export default {
     width: 50%;
   }
 }
+
+.input_style{
+  border-radius: 5px;
+  border: 1px solid #dbdbdb;
+}
 </style>