Procházet zdrojové kódy

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

csx před 3 roky
rodič
revize
5cdac83fa2

+ 47 - 2
src/xt_pages/outpatientCharges/components/registerDialog.vue Zobrazit soubor

@@ -171,6 +171,27 @@
171 171
             <el-form-item label="诊疗费:">
172 172
                 <el-input v-model="form.medical_expenses"></el-input>
173 173
             </el-form-item>
174
+
175
+            <el-form-item label="医生:" prop="doctor">
176
+                <el-select v-model="form.doctor" placeholder="请选择">
177
+                    <el-option
178
+                            v-for="(item,index) in doctors"
179
+                            :key="index"
180
+                            :label="item.user_name"
181
+                            :value="item.admin_user_id">
182
+                    </el-option>
183
+                </el-select>
184
+            </el-form-item>
185
+            <el-form-item label="科室:" prop="department">
186
+                <el-select v-model="form.department" placeholder="请选择">
187
+                    <el-option
188
+                            v-for="(item,index) in departments"
189
+                            :key="index"
190
+                            :label="item.name"
191
+                            :value="item.id">
192
+                    </el-option>
193
+                </el-select>
194
+            </el-form-item>
174 195
         </el-form>
175 196
 
176 197
         <span slot="footer" class="dialog-footer">
@@ -366,7 +387,12 @@
366 387
       }
367 388
     },
368 389
     props: {
369
-
390
+      departments: {
391
+        type: Array
392
+      },
393
+      doctors: {
394
+        type: Array
395
+      },
370 396
       titles: {
371 397
         type: String,
372 398
         default: ''
@@ -388,6 +414,18 @@
388 414
       diagnoses: Array
389 415
     },
390 416
     methods: {
417
+      changeDoctor() {
418
+        for (let i = 0; i < this.doctors.length; i++) {
419
+          if (this.doctors[i].admin_user_id == this.form.doctor) {
420
+            console.log(this.doctors[i].department_id)
421
+            this.form.department = this.doctors[i].department_id
422
+            if (this.form.department == 0) {
423
+
424
+              this.form.department = ''
425
+            }
426
+          }
427
+        }
428
+      },
391 429
       handleSelect(val) {
392 430
         this.form.id = val.id
393 431
         this.form.name = val.name
@@ -476,7 +514,7 @@
476 514
       getDictionaryDataConfig(module, filed_name) {
477 515
         return getDictionaryDataConfig(module, filed_name)
478 516
       },
479
-      show: function() {
517
+      show: function(doctors,departments) {
480 518
         this.visibility = true
481 519
         // this.form = Object.assign({}, this.resetForm)
482 520
         this.form.id = 0
@@ -503,6 +541,13 @@
503 541
         this.form.id_card_type = 2
504 542
         this.form.certificates = 1
505 543
 
544
+        if (departments.length > 0) {
545
+          this.form.department = departments[0].id
546
+        }
547
+        if (doctors.length > 0) {
548
+          this.form.doctor = doctors[0].admin_user_id
549
+        }
550
+
506 551
         // this.form.name = patientInfo.name
507 552
         // this.form.gender = patientInfo.gender
508 553
         // this.form.age = patientInfo.age

+ 2 - 2
src/xt_pages/outpatientCharges/outpatientChargesManagement.vue Zobrazit soubor

@@ -442,7 +442,7 @@
442 442
         <additionalCharges ref='additionalCharges' @click="addCharges"
443 443
                            :addtions_charge="addtions_charge"></additionalCharges>
444 444
 
445
-        <register-dialog ref='register' :doctors="doctors" :department="department" :sick="sick" :diagnoses="diagnoses"
445
+        <register-dialog ref='register' :doctors="doctors" :departments="department" :sick="sick" :diagnoses="diagnoses"
446 446
                          v-on:confirm="confirm" v-on:cancel="cancel"></register-dialog>
447 447
 
448 448
         <register-dialog9504 ref='register9504' :doctors="doctors" :departments="department" :sick="sick"
@@ -2099,7 +2099,7 @@
2099 2099
           if (this.$store.getters.xt_user.org_id == 9504 || this.$store.getters.xt_user.org_id == 10138 || this.$store.getters.xt_user.org_id == 10028 || this.$store.getters.xt_user.org_id == 10088) {
2100 2100
             this.$refs.register9504.show()
2101 2101
           } else {
2102
-            this.$refs.register.show()
2102
+            this.$refs.register.show(this.doctors, this.department)
2103 2103
           }
2104 2104
 
2105 2105
         } else if (index == 8) {