Przeglądaj źródła

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

huangyw 2 lat temu
rodzic
commit
bb1fe28438

+ 1 - 1
src/xt_pages/outpatientTool/gatherPrintInvoice.vue Wyświetl plik

16
             <tr>
16
             <tr>
17
                 <td>姓名:{{patient.name}}</td>
17
                 <td>姓名:{{patient.name}}</td>
18
                 <td>科室:
18
                 <td>科室:
19
-                    <!-- {{getDepartment(his_patient.departments)}} -->
19
+                    <span v-if="this.$store.getters.xt_user.org.id!=10215"> {{getDepartment(his_patient.departments)}}</span>
20
 
20
 
21
                    {{ getDepartment(his_record_patient.departments) }}
21
                    {{ getDepartment(his_record_patient.departments) }}
22
                 </td>
22
                 </td>

+ 2 - 2
src/xt_pages/user/dialysisRecord.vue Wyświetl plik

576
       var dl = this.doctorOptions.length;
576
       var dl = this.doctorOptions.length;
577
       if (dl > 0) {
577
       if (dl > 0) {
578
         for (let index = 0; index < dl; index++) {
578
         for (let index = 0; index < dl; index++) {
579
-          if ((this.doctorOptions[index].id = creater)) {
579
+          if ((this.doctorOptions[index].id == creater)) {
580
             return this.doctorOptions[index].name;
580
             return this.doctorOptions[index].name;
581
           }
581
           }
582
         }
582
         }
588
       if (dl > 0) {
588
       if (dl > 0) {
589
         for (let index = 0; index < dl; index++) {
589
         for (let index = 0; index < dl; index++) {
590
 
590
 
591
-          if (this.nurseOptions[index].id = start_nurse) {
591
+          if (this.nurseOptions[index].id == start_nurse) {
592
 
592
 
593
             return this.nurseOptions[index].name;
593
             return this.nurseOptions[index].name;
594
           }
594
           }