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

src/store/modules/globalConfig.js

@@ -1867,6 +1867,10 @@ const global_config = {
         id: 34,
         name: '副'
       },
+      {
+        id: 35,
+        name: '本'
+      },
     ],
     body_fluid: [{
       id: 1,

src/xt_pages/dialysis/details/dialog/dialysisPrescriptionDialog.vue

@@ -2898,6 +2898,7 @@
             this.$message.error(response.data.msg)
             return false
           } else {
+            console.log("切换数据", response.data.data.solution)
             this.$message.success('切换成功')
             if (response.data.data.solution != null) {
               for (const key in response.data.data.solution) {

src/xt_pages/user/dialysisRecord.vue

@@ -331,7 +331,7 @@
               <th>透后称重（kg）</th>
               <th>透前血压（mmhg）</th>
               <th>透后血压（mmhg）</th>
-              <th>超滤总量（L）</th>
+              <th>目标超滤量（L）</th>
               <th>血管通路</th>
               <th>抗凝剂种类 首剂/维持/总量</th>
               <th>透析器型号</th>
@@ -361,7 +361,7 @@
                   }}
                 </td>
                 <td>
-                  {{ item.predialysis_evaluation.ultrafiltration_amount }}
+                  {{ item.prescription.target_ultrafiltration }}
                 </td>
                 <td>{{ setVascularAccess(item.prescription) }}</td>
                 <td>{{ setAnticoagulantsConfit(item.prescription) }}</td>