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

src/xt_pages/dialysis/details/assessmentAfter.vue

@@ -712,23 +712,6 @@ export default {
     },
     isShow(name) {
       var filedList = store.getters.xt_user.fileds;
-      console.log("filedList", filedList);
-      var arr = [];
-      for (let j = 0; j < filedList.length; j++) {
-        if (filedList[j].module == 5) {
-          arr.push(filedList[j]);
-        }
-      }
-      var arrtwo = [];
-      for (let z = 0; z < filedList.length; z++) {
-        if (filedList[z].filed_name == "observation_content") {
-          console.log(filedList[z].filed_name_cn);
-          if (filedList[z].filed_name_cn == "交待病房护士/患者/陪人观察内容") {
-            // console.log(filedList[z]);
-          }
-        }
-      }
-      console.log("arr", arr);
       for (let i = 0; i < filedList.length; i++) {
         if (
           filedList[i].module == 5 &&

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

@@ -9,7 +9,6 @@
     >
       <div class="warnTxt" v-if="showTxt != ''">{{ showTxt }}</div>
       <el-form ref="form" :model="form" label-width="160px">
-        <!-- <el-row :gutter="20"> -->
         <el-row :gutter="20">
           <el-col :span="8" v-if="isShow('实际治疗时长')">
             <el-form-item label="实际治疗时长(时):">
@@ -74,7 +73,9 @@
               ></el-input>
             </el-form-item>
           </el-col>
+        </el-row>
 
+        <el-row :gutter="20">
           <el-col :span="8" v-if="isShow('内瘘')">
             <el-form-item label="内瘘: ">
               <el-input
@@ -84,9 +85,7 @@
               ></el-input>
             </el-form-item>
           </el-col>
-        </el-row>
 
-        <el-row :gutter="20">
           <el-col :span="8" v-if="isShow('导管')">
             <el-form-item label="导管: ">
               <el-input
@@ -127,9 +126,7 @@
               ></el-input>
             </el-form-item>
           </el-col>
-        </el-row>
 
-        <el-row :gutter="20">
           <el-col :span="8" v-if="isShow('透析过程提前其他原因')">
             <el-form-item label="透析过程提前其他原因: ">
               <el-input
@@ -138,12 +135,15 @@
               ></el-input>
             </el-form-item>
           </el-col>
+        </el-row>
 
+        <el-row :gutter="20">
           <el-col :span="8" v-if="isShow('内瘘管拔针后压迫止血时间')">
             <el-form-item label="内瘘管拔针后压迫止血时间(min): ">
               <el-input v-model="form.hemostasis_minute" :rows="5"></el-input>
             </el-form-item>
           </el-col>
+
           <el-col :span="8" v-if="isShow('内瘘管拔针后压迫止血操作')">
             <el-form-item label="内瘘管拔针后压迫止血操作: ">
               <el-select v-model="form.hemostasis_opera">
@@ -173,7 +173,8 @@
               </el-select>
             </el-form-item>
           </el-col>
-
+        </el-row>
+        <el-row :gutter="20">
           <el-col :span="8" v-if="isShow('静脉管道')">
             <el-form-item label="静脉管道: ">
               <el-select v-model="form.intravenous_tube">
@@ -203,7 +204,6 @@
             <el-form-item label="患者去向: ">
               <el-select v-model="form.patient_gose">
                 <el-option :key="0" label="请选择" :value="0"></el-option>
-
                 <el-option
                   v-for="item in patientGoseOptions"
                   :label="item.name"
@@ -214,15 +214,17 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <el-col :span="8" v-if="isShow('拔针后穿刺点渗血')">
-          <el-form-item label="拔针后穿刺点渗血: ">
-            <el-radio-group v-model="form.puncture_point_oozing_blood">
-              <el-radio :label="1">有</el-radio>
-              <el-radio :label="2">无</el-radio>
-            </el-radio-group>
-          </el-form-item>
-        </el-col>
 
+        <el-row>
+          <el-col :span="8" v-if="isShow('拔针后穿刺点渗血')">
+            <el-form-item label="拔针后穿刺点渗血: ">
+              <el-radio-group v-model="form.puncture_point_oozing_blood">
+                <el-radio :label="1">有</el-radio>
+                <el-radio :label="2">无</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+        </el-row>
         <!--          <el-col :span="8" v-if="isShow('压迫后内瘘震颤')">-->
         <!--            <el-form-item label="压迫后内瘘震颤: ">-->
         <!--              <el-select v-model="form.internal_fistula_tremor_ac">-->
@@ -248,12 +250,15 @@
             </el-form-item>
           </el-col>
         </el-row>
+
         <el-row
           :gutter="20"
-          v-if="form.patient_gose == 3 && isShow('交待观察内容')"
+          v-if="
+            form.patient_gose == 3 && isShow('交待病房护士/患者/陪人观察内容')
+          "
         >
           <el-col :span="24">
-            <el-form-item label="交待观察内容: ">
+            <el-form-item label="交待病房护士/患者/陪人观察内容: ">
               <el-input
                 placeholder="交待病房护士/患者/陪人观察内容"
                 v-model="form.observation_content"
@@ -264,6 +269,7 @@
             </el-form-item>
           </el-col>
         </el-row>
+
         <el-row
           :gutter="20"
           v-show="form.patient_gose == 3 && isShow('其他观察内容')"
@@ -1076,6 +1082,7 @@ export default {
     this.internalFistulaTremorAcOptions = this.$store.getters.internal_fistula_tremor_ac;
     this.patientGoseOptions = this.$store.getters.patient_gose;
     this.observationContentOptions = this.$store.getters.observation_content;
+    console.log("----", this.$store.getters.observation_content);
     this.template_id = this.$store.getters.xt_user.template_info.template_id;
 
     this.channels = this.$store.getters.channels;