Browse Source

提交代码

XMLWAN 5 years ago
parent
commit
c48e9f441f

+ 0 - 2
src/xt_pages/data/showConfig.vue View File

114
     },
114
     },
115
     created(){
115
     created(){
116
       var filedList = store.getters.xt_user.fileds
116
       var filedList = store.getters.xt_user.fileds
117
-      console.log(filedList)
118
-
119
       for (let i = 0; i < filedList.length;i++){
117
       for (let i = 0; i < filedList.length;i++){
120
         switch (filedList[i].module) {
118
         switch (filedList[i].module) {
121
           case 1:
119
           case 1:

+ 0 - 6
src/xt_pages/dialysis/batch_print/batch_print_order_other_one.vue View File

1168
           return false
1168
           return false
1169
         } else {
1169
         } else {
1170
           return record[key] == target_value
1170
           return record[key] == target_value
1171
-<<<<<<< HEAD
1172
-=======
1173
-
1174
-
1175
-
1176
->>>>>>> e4c90cfdbcb598ed9f3db253a2650c2de8005951
1177
         }
1171
         }
1178
       }, getAge: function(val) {
1172
       }, getAge: function(val) {
1179
         if (val.age == 0) {
1173
         if (val.age == 0) {

+ 10 - 7
src/xt_pages/dialysis/batch_print/batch_print_order_seven.vue View File

205
               >
205
               >
206
                     &nbsp;
206
                     &nbsp;
207
                     <label-box
207
                     <label-box
208
-                      :isChecked="record.assessment_after_dislysis.blood_access_part_opera_id == 14 ? true : false"
208
+                      :isChecked="record.assessment_before_dislysis.blood_access_part_opera_name == '内瘘' ? true : false"
209
                       showValue="内瘘"
209
                       showValue="内瘘"
210
                     ></label-box>
210
                     ></label-box>
211
                     &nbsp;
211
                     &nbsp;
212
                     <label-box
212
                     <label-box
213
-                      :isChecked="record.assessment_after_dislysis.blood_access_part_opera_id == 17 || record.assessment_after_dislysis.blood_access_part_opera_id == 18 ? true : false"
213
+                      :isChecked="record.assessment_before_dislysis.blood_access_part_opera_name == '长期静脉导管'  ? true : false"
214
                       showValue="长期静脉导管"
214
                       showValue="长期静脉导管"
215
                     ></label-box>
215
                     ></label-box>
216
                     </label-box>
216
                     </label-box>
217
                     &nbsp;
217
                     &nbsp;
218
                     <label-box
218
                     <label-box
219
-                      :isChecked="record.assessment_after_dislysis.blood_access_part_opera_id == 17 || record.assessment_after_dislysis.blood_access_part_opera_id == 18  ? true : false"
220
-                      showValue="临时(、股)静脉导管"
219
+                      :isChecked="record.assessment_before_dislysis.blood_access_part_opera_name == '临时颈静脉导管'   ? true : false"
220
+                      showValue="临时颈静脉导管"
221
                     ></label-box>
221
                     ></label-box>
222
                     &nbsp;
222
                     &nbsp;
223
-                    <label-box
224
-                      :isChecked="record.assessment_after_dislysis.blood_access_part_opera_id >17 ? true : false"
225
-                      showValue="其它"
223
+                     <label-box
224
+                      :isChecked="record.assessment_before_dislysis.blood_access_part_opera_name == '临时股静脉导管'   ? true : false"
225
+                      showValue="临时股静脉导管"
226
                     ></label-box>
226
                     ></label-box>
227
+                    &nbsp;
228
+                    <label-box
229
+                      :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>
227
                     &nbsp;&nbsp;&nbsp;&nbsp;<span>穿刺者:{{getName(record.dialysis_order.puncture_nurse)}}</span>
230
                     &nbsp;&nbsp;&nbsp;&nbsp;<span>穿刺者:{{getName(record.dialysis_order.puncture_nurse)}}</span>
228
                   </td>
231
                   </td>
229
                 </tr>
232
                 </tr>

+ 0 - 1
src/xt_pages/dialysis/details/dialog/monitor_dialog.vue View File

686
     },
686
     },
687
     isShow(name) {
687
     isShow(name) {
688
       var filedList = store.getters.xt_user.fileds;
688
       var filedList = store.getters.xt_user.fileds;
689
-      console.log("filedList----", filedList);
690
       for (let i = 0; i < filedList.length; i++) {
689
       for (let i = 0; i < filedList.length; i++) {
691
         if (
690
         if (
692
           filedList[i].module == 4 &&
691
           filedList[i].module == 4 &&

File diff suppressed because it is too large
+ 792 - 788
src/xt_pages/dialysis/template/DialysisPrintOrderSeven.vue