Merge branch 'superman' of http://git.shengws.com/zhangbj/xt_vue into superman

src/xt_pages/data/printTemplate.vue

@@ -112,7 +112,7 @@
               //同步
               this.loading = false
 
-              store.dispatch("updateAllFiledConfigList", response.data.data.fileds).then(() => {});
+              // store.dispatch("updateAllFiledConfigList", response.data.data.fileds).then(() => {});
               this.$message({
                 type: 'success',
                 message: '切换成功'

src/xt_pages/dialysis/details/assessmentBefore.vue

@@ -95,6 +95,15 @@
           <span class="unit" v-if="systolic_blood_pressure!='0'">mmHg</span>
         </li>
 
+        <li v-if="isShow('导管打折')">
+          <label>导管打折 : </label>
+          <span class="content" v-if="this.record.catheter_bend == 0"></span>
+          <span class="content" v-if="this.record.catheter_bend == 1">{{ '有' }}</span>
+          <span class="content" v-if="this.record.catheter_bend == 2">{{ '无' }}</span>
+
+          <span class="unit"></span>
+        </li>
+
         <li v-if="isShow('导管')">
           <label>导管 : </label>
           <span class="content">{{ catheter }}</span>
@@ -117,6 +126,15 @@
           <span class="unit"></span>
         </li>
 
+        <li v-if="isShow('内瘘')">
+          <label>内瘘: </label>
+          <span class="content">{{ internal_fistula }}</span>
+          <span class="unit"></span>
+        </li>
+
+
+
+
         <li v-if="isShow('血管通路(内瘘)')">
           <label>血管通路(内瘘) : </label>
           <span class="content">{{blood_access_internal_fistula}}</span>
@@ -270,7 +288,11 @@
         </li>
 
 
-
+        <li v-if="isShow('内瘘皮肤情况')">
+          <label>内瘘皮肤情况: </label>
+          <span class="content">{{ internal_fistula_skin }}</span>
+          <span class="unit"></span>
+        </li>
 
 
 
@@ -392,6 +414,14 @@ export default {
         }
         return this.record.internal_fistula
       },
+
+    internal_fistula_skin: function() {
+      if (this.record.id == 0) {
+        return '-'
+      }
+      return this.record.internal_fistula_skin
+    },
+
       is_hemorrhage: function() {
         if (this.record.id == 0) {
           return false

src/xt_pages/dialysis/template/DialysisPrintOrderSix.vue

@@ -115,10 +115,7 @@
         </div>
         <div class="inline_block" style="margin-left: 10px;">
           诊断：
-          <div
-            class="under_line"
-            style="width: 640px;text-align: left;word-break: break-all;word-wrap: break-word;display: inline-block;white-space: pre-wrap;"
-          >
+          <div class="under_line" style="width: 640px;text-align: left;word-wrap: break-word;white-space: inherit;" >
             {{ patientInfo.diagnose }}
           </div>
         </div>