提交代码

src/xt_pages/data/showConfig.vue

@@ -114,8 +114,6 @@
     },
     created(){
       var filedList = store.getters.xt_user.fileds
-      console.log(filedList)
-
       for (let i = 0; i < filedList.length;i++){
         switch (filedList[i].module) {
           case 1:

src/xt_pages/dialysis/batch_print/batch_print_order_other_one.vue

@@ -1168,12 +1168,6 @@
           return false
         } else {
           return record[key] == target_value
-<<<<<<< HEAD
-=======
-
-
-
->>>>>>> e4c90cfdbcb598ed9f3db253a2650c2de8005951
         }
       }, getAge: function(val) {
         if (val.age == 0) {

src/xt_pages/dialysis/batch_print/batch_print_order_seven.vue

@@ -205,25 +205,28 @@
               >
                      
                     <label-box
-                      :isChecked="record.assessment_after_dislysis.blood_access_part_opera_id == 14 ? true : false"
+                      :isChecked="record.assessment_before_dislysis.blood_access_part_opera_name == '内瘘' ? true : false"
                       showValue="内瘘"
                     ></label-box>
                     &nbsp;
                     <label-box
-                      :isChecked="record.assessment_after_dislysis.blood_access_part_opera_id == 17 || record.assessment_after_dislysis.blood_access_part_opera_id == 18 ? true : false"
+                      :isChecked="record.assessment_before_dislysis.blood_access_part_opera_name == '长期静脉导管'  ? true : false"
                       showValue="长期静脉导管"
                     ></label-box>
                     </label-box>
                     &nbsp;
                     <label-box
-                      :isChecked="record.assessment_after_dislysis.blood_access_part_opera_id == 17 || record.assessment_after_dislysis.blood_access_part_opera_id == 18  ? true : false"
-                      showValue="临时(颈、股)静脉导管"
+                      :isChecked="record.assessment_before_dislysis.blood_access_part_opera_name == '临时颈静脉导管'   ? true : false"
+                      showValue="临时颈静脉导管"
                     ></label-box>
                     &nbsp;
-                    <label-box
-                      :isChecked="record.assessment_after_dislysis.blood_access_part_opera_id >17 ? true : false"
-                      showValue="其它"
+                     <label-box
+                      :isChecked="record.assessment_before_dislysis.blood_access_part_opera_name == '临时股静脉导管'   ? true : false"
+                      showValue="临时股静脉导管"
                     ></label-box>
+                    &nbsp;
+                    <label-box
+                      :isChecked="record.assessment_before_dislysis.blood_access_part_opera_name !='内瘘' && record.assessment_before_dislysis.blood_access_part_opera_name !='临时颈静脉导管' && record.assessment_before_dislysis.blood_access_part_opera_name !='内瘘' && record.assessment_before_dislysis.blood_access_part_opera_name !='内瘘' && record.assessment_before_dislysis.blood_access_part_opera_name !='临时股静脉导管'  ? true : false" showValue="其它"></label-box>
                     &nbsp;&nbsp;&nbsp;&nbsp;<span>穿刺者:{{getName(record.dialysis_order.puncture_nurse)}}</span>
                   </td>
                 </tr>

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

@@ -686,7 +686,6 @@ export default {
     },
     isShow(name) {
       var filedList = store.getters.xt_user.fileds;
-      console.log("filedList----", filedList);
       for (let i = 0; i < filedList.length; i++) {
         if (
           filedList[i].module == 4 &&