2 Комити 3860bfe12b ... 45a0df8320

Аутор SHA1 Порука Датум
  陈少旭 45a0df8320 Merge branch '20230223_pc_vue_new_branch' of http://git.shengws.com/csx/Vue_New into 20230223_pc_vue_new_branch пре 1 дан
  陈少旭 9e3d132a55 1111 пре 3 дана

+ 4 - 5
src/xt_pages/outpatientDoctorStation/doctorDesk.vue Прегледај датотеку

2616
                     }else{
2616
                     }else{
2617
                       preTime = this.record_date + ' ' + '17:00'
2617
                       preTime = this.record_date + ' ' + '17:00'
2618
                     }
2618
                     }
2619
-                   
2619
+
2620
                   }
2620
                   }
2621
 
2621
 
2622
                   if(this.org_id == 10510  || this.org_id == 0){
2622
                   if(this.org_id == 10510  || this.org_id == 0){
2767
 
2767
 
2768
             }
2768
             }
2769
           }
2769
           }
2770
-        
2771
-          
2770
+
2771
+
2772
           this.$refs.prescriptions.setData(this.prescriptions, this.info, this.admin_info, this.doctors, this.department, this.hisPatientInfo, this.month_prescriptions, this.last_info, this.sick, this.diagnosis, this.patient_diagnoses)
2772
           this.$refs.prescriptions.setData(this.prescriptions, this.info, this.admin_info, this.doctors, this.department, this.hisPatientInfo, this.month_prescriptions, this.last_info, this.sick, this.diagnosis, this.patient_diagnoses)
2773
         }
2773
         }
2774
       })
2774
       })
6487
       if (val.length == 0) {
6487
       if (val.length == 0) {
6488
         this.selecting_schs3 = []
6488
         this.selecting_schs3 = []
6489
       } else {
6489
       } else {
6490
-        if (this.org_id == 10402 ) {
6490
+        if (this.org_id == 10402 || this.org_id == 10653 || this.org_id == 0) {
6491
           this.selecting_schs3 = val
6491
           this.selecting_schs3 = val
6492
 
6492
 
6493
         } else {
6493
         } else {
6521
           })
6521
           })
6522
         }
6522
         }
6523
       }
6523
       }
6524
-
6525
     },
6524
     },
6526
     savePrint() {
6525
     savePrint() {
6527
       //处方
6526
       //处方

+ 11 - 0
src/xt_pages/outpatientTool/components/pdetail.vue Прегледај датотеку

79
         <template slot-scope="scope">{{ scope.row.certno}}</template>
79
         <template slot-scope="scope">{{ scope.row.certno}}</template>
80
       </el-table-column>
80
       </el-table-column>
81
 
81
 
82
+      <el-table-column align="center" prop="name" label="院内编码" fixed>
83
+<!--        <template slot-scope="scope">{{ scope.row.code }}</template>-->
84
+        <template slot-scope="scope">
85
+
86
+        <div v-if="scope.row.type == 1">{{'YP' + scope.row.item_id}}</div>
87
+        <div v-if="scope.row.type == 2">{{'XM' + scope.row.item_id}}</div>
88
+        <div v-if="scope.row.type == 3">{{'HC' + scope.row.item_id}}</div>
89
+        </template>
90
+
91
+      </el-table-column>
92
+
82
       <el-table-column align="center" prop="name" label="就诊ID" fixed>
93
       <el-table-column align="center" prop="name" label="就诊ID" fixed>
83
         <template slot-scope="scope">{{ scope.row.mdtrt_id }}</template>
94
         <template slot-scope="scope">{{ scope.row.mdtrt_id }}</template>
84
       </el-table-column>
95
       </el-table-column>