Merge branch 'master' of http://git.shengws.com/csx/Vue_New

src/xt_pages/dialysis/details/DialysisPrescription.vue

@@ -114,7 +114,7 @@
           <span class="unit" v-if="getValueStr('anticoagulant','anticoagulant') == 4">{{anticoagulant_shouji != '0'?"mg":""}}</span>
           <span class="unit" v-if="getValueStr('anticoagulant','anticoagulant') == 5">{{anticoagulant_shouji != '0'?"mg":""}}</span>
         </li>
-       
+
 
         <li v-if="isShow('钙')">
           <label>钙: </label>
@@ -127,8 +127,8 @@
           <span class="content">{{body_fluid}}</span>
           <span class="unit"></span>
         </li>
-        
-    
+
+
         <li v-if="isShow('透析前使用其他特殊药物')">
           <label>透析前使用其他特殊药物: </label>
           <span class="content">{{special_medicine_other}}</span>
@@ -147,9 +147,9 @@
           <span class="unit">{{blood_flow_volume != '0'?"ml/min":''}}</span>
         </li>
       </ul>
-      
+
       <ul>
-        
+
          <li v-if="isShow('钠')">
           <label>钠 : </label>
           <span class="content">{{sodium != '0'?sodium:""}}</span>
@@ -186,21 +186,13 @@
           <span class="unit" v-if="getValueStr('anticoagulant','anticoagulant') == 5">{{anticoagulant_weichi != '0'?"ml/h":""}}</span>
         </li>
 
-       
+
        <li v-if="isShow('钙剂量')&&getValueStr('anticoagulant','anticoagulant') == 5">
           <label>钙剂量: </label>
           <span class="content">{{getValueStr('anticoagulant_gaijiliang','anticoagulant_gaijiliang')}}</span>
           <span class="unit" v-if="getValueStr('anticoagulant','anticoagulant') == 5">{{'ml'}}</span>
         </li>
 
-     
-
-
-
-
-
-
-
 
         <li v-if="isShow('实际超滤量')">
           <label>实际超滤量: </label>

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

@@ -349,43 +349,43 @@
 
 
                   <el-row :gutter="20"> -->
-          <el-col :span="8" v-if="isShow('内瘘震颤和血管杂音')">
-            <el-form-item label="内瘘震颤和血管杂音: ">
-              <el-select v-model="form.tremor_noise">
-                <el-option :key="0" label="请选择" :value="0"></el-option>
+<!--          <el-col :span="8" v-if="isShow('内瘘震颤和血管杂音')">-->
+<!--            <el-form-item label="内瘘震颤和血管杂音: ">-->
+<!--              <el-select v-model="form.tremor_noise">-->
+<!--                <el-option :key="0" label="请选择" :value="0"></el-option>-->
 
-                <el-option
-                  v-for="item in this.$store.getters.tremor_noise"
-                  :label="item.name"
-                  :value="item.id"
-                  :key="item.id"
-                ></el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="8" v-if="isShow('失衡综合症')">
-            <el-form-item label="失衡综合症: ">
-              <el-select v-model="form.disequilibrium_syndrome">
-                <el-option :key="0" label="请选择" :value="0"></el-option>
+<!--                <el-option-->
+<!--                  v-for="item in this.$store.getters.tremor_noise"-->
+<!--                  :label="item.name"-->
+<!--                  :value="item.id"-->
+<!--                  :key="item.id"-->
+<!--                ></el-option>-->
+<!--              </el-select>-->
+<!--            </el-form-item>-->
+<!--          </el-col>-->
+<!--          <el-col :span="8" v-if="isShow('失衡综合症')">-->
+<!--            <el-form-item label="失衡综合症: ">-->
+<!--              <el-select v-model="form.disequilibrium_syndrome">-->
+<!--                <el-option :key="0" label="请选择" :value="0"></el-option>-->
 
-                <el-option
-                  v-for="item in this.$store.getters.disequilibrium_syndrome"
-                  :label="item.name"
-                  :value="item.id"
-                  :key="item.id"
-                ></el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="8" v-if="isShow('失衡综合症症状')">
-            <el-form-item label="失衡综合症症状: ">
-              <el-input
-                v-model="form.disequilibrium_syndrome_option"
-                readonly
-                @focus="showDialog('8')"
-              ></el-input>
-            </el-form-item>
-          </el-col>
+<!--                <el-option-->
+<!--                  v-for="item in this.$store.getters.disequilibrium_syndrome"-->
+<!--                  :label="item.name"-->
+<!--                  :value="item.id"-->
+<!--                  :key="item.id"-->
+<!--                ></el-option>-->
+<!--              </el-select>-->
+<!--            </el-form-item>-->
+<!--          </el-col>-->
+<!--          <el-col :span="8" v-if="isShow('失衡综合症症状')">-->
+<!--            <el-form-item label="失衡综合症症状: ">-->
+<!--              <el-input-->
+<!--                v-model="form.disequilibrium_syndrome_option"-->
+<!--                readonly-->
+<!--                @focus="showDialog('8')"-->
+<!--              ></el-input>-->
+<!--            </el-form-item>-->
+<!--          </el-col>-->
 
           <!-- </el-row>
 

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

@@ -180,7 +180,7 @@
           </el-col>
 
           <el-col :span="8">
-            <el-form-item label="前次透析后：" v-if="isShow('前次透析后')">
+            <el-form-item label="前次透析后症状：" v-if="isShow('前次透析后症状')">
               <el-input v-model="assessmentBeforeDislysis.last_post_dialysis" @focus="showInnerDialog('1')"></el-input>
             </el-form-item>
           </el-col>

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

@@ -273,11 +273,11 @@
 
           <!-- </el-row>
           <el-row :gutter="20" > -->
-          <el-col :span="8" v-if="isShows('实际超滤量')">
-            <el-form-item label="实际超滤量(L)">
-              <el-input v-model="dialysisPrescription.ultrafiltration"></el-input>
-            </el-form-item>
-          </el-col>
+<!--          <el-col :span="8" v-if="isShows('实际超滤量')">-->
+<!--            <el-form-item label="实际超滤量(L)">-->
+<!--              <el-input v-model="dialysisPrescription.ultrafiltration"></el-input>-->
+<!--            </el-form-item>-->
+<!--          </el-col>-->
 
 
           <!--透析耗材-->